use SubclassWin() insteaf of just wxAssociateWinWithHandle() to make sure we generate...

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

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index ab18f0acb344e42e407d9abde71ef98b03290079..4e61d5074e7b371abaa3ae043bbb2b50f3e869ff 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_bmp.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,7 +15,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC

 
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
 
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"


@@ -33,7 +29,9 @@ wxBitmapXmlHandler::wxBitmapXmlHandler()
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {

-    return new wxBitmap(GetBitmap(wxT("")));
+    // NB: empty parameter name means "take directly from this node's next
+    //     instead of from subnode with given name"
+    return new wxBitmap(GetBitmap(wxEmptyString));

 }
 
 bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
 }
 
 bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)


@@ -50,7 +48,9 @@ wxIconXmlHandler::wxIconXmlHandler()
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {

-    return new wxIcon(GetIcon(wxT("")));
+    // NB: empty parameter name means "take directly from this node's next
+    //     instead of from subnode with given name"
+    return new wxIcon(GetIcon(wxEmptyString));

 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)


@@ -58,4 +58,4 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxIcon"));
 }
 
     return IsOfClass(node, wxT("wxIcon"));
 }
 

-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC