oops... conflict removed

[wxWidgets.git] / contrib / src / xml / xh_stbmp.cpp

diff --git a/contrib/src/xml/xh_stbmp.cpp b/contrib/src/xml/xh_stbmp.cpp
index 8ec8d5553cd4b9726d2b57593965c17306e2e239..699e5339a5c0264e21805df3bcf85b7c9611dd00 100644 (file)
--- a/contrib/src/xml/xh_stbmp.cpp
+++ b/contrib/src/xml/xh_stbmp.cpp
@@ -25,13 +25,14 @@
 wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() 
 : wxXmlResourceHandler() 
 {
 wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() 
 : wxXmlResourceHandler() 
 {

+    AddWindowStyles();

 }
 
 wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
 { 
     wxStaticBitmap *bmp = new wxStaticBitmap(m_ParentAsWindow,
                                     GetID(),
 }
 
 wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
 { 
     wxStaticBitmap *bmp = new wxStaticBitmap(m_ParentAsWindow,
                                     GetID(),

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

                                     GetPosition(), GetSize(),
                                     GetStyle(),
                                     GetName()
                                     GetPosition(), GetSize(),
                                     GetStyle(),
                                     GetName()


@@ -45,7 +46,7 @@ wxObject *wxStaticBitmapXmlHandler::DoCreateResource()
 
 bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
 {
 
 bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
 {

-    return node->GetName() == _T("staticbitmap");
+    return IsOfClass(node, wxT("wxStaticBitmap"));

 }
 
 
 }