assert that name, not full path, is used in RenameEntry(); fixed RenameGroup() which...

[wxWidgets.git] / src / xrc / xh_stbmp.cpp

diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp
index 95edf5085317b420e6716672749c7a3d82bc4808..42f8073a91c646742ab342b06f460a432f89ae68 100644 (file)
--- a/src/xrc/xh_stbmp.cpp
+++ b/src/xrc/xh_stbmp.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_stbmp.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_stbmp.h"
 #endif


@@ -19,28 +19,32 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_stbmp.h"
 #include "wx/statbmp.h"
 
 #include "wx/xrc/xh_stbmp.h"
 #include "wx/statbmp.h"
 

-wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmapXmlHandler, wxXmlResourceHandler)
+
+wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler()
+: wxXmlResourceHandler()

 {
     AddWindowStyles();
 }
 
 wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
 {
     AddWindowStyles();
 }
 
 wxObject *wxStaticBitmapXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(bmp, wxStaticBitmap)
 
     bmp->Create(m_parentAsWindow,
                 GetID(),
     XRC_MAKE_INSTANCE(bmp, wxStaticBitmap)
 
     bmp->Create(m_parentAsWindow,
                 GetID(),

-                GetBitmap(wxT("bitmap"), GetSize()),
+                GetBitmap(wxT("bitmap"), wxART_OTHER, GetSize()),

                 GetPosition(), GetSize(),
                 GetStyle(),
                 GetName());
 
     SetupWindow(bmp);
                 GetPosition(), GetSize(),
                 GetStyle(),
                 GetName());
 
     SetupWindow(bmp);

-    
+

     return bmp;
 }
 
     return bmp;
 }
 


@@ -48,3 +52,5 @@ bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticBitmap"));
 }
 {
     return IsOfClass(node, wxT("wxStaticBitmap"));
 }

+
+#endif // wxUSE_XRC