projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial implementation of wxWebProtocolHandler and wxWebFileProtocolHandler for the...
[wxWidgets.git]
/
src
/
xrc
/
xh_stbmp.cpp
diff --git
a/src/xrc/xh_stbmp.cpp
b/src/xrc/xh_stbmp.cpp
index 42f8073a91c646742ab342b06f460a432f89ae68..2fdcd9699936c25e0c912b8e0de99f8ef2f99f04 100644
(file)
--- a/
src/xrc/xh_stbmp.cpp
+++ b/
src/xrc/xh_stbmp.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_stbmp.cpp
+// Name:
src/xrc/
xh_stbmp.cpp
// Purpose: XRC resource for wxStaticBitmap
// Author: Vaclav Slavik
// Created: 2000/04/22
// Purpose: XRC resource for wxStaticBitmap
// Author: Vaclav Slavik
// Created: 2000/04/22
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_stbmp.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-19,15
+15,18
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#if wxUSE_XRC
+#if wxUSE_XRC
&& wxUSE_STATBMP
#include "wx/xrc/xh_stbmp.h"
#include "wx/xrc/xh_stbmp.h"
-#include "wx/statbmp.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/statbmp.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler)
wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler()
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler)
wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler()
-
:
wxXmlResourceHandler()
+
:
wxXmlResourceHandler()
{
AddWindowStyles();
}
{
AddWindowStyles();
}
@@
-53,4
+52,4
@@
bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
return IsOfClass(node, wxT("wxStaticBitmap"));
}
return IsOfClass(node, wxT("wxStaticBitmap"));
}
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC
&& wxUSE_STATBMP