X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0966aee3d9eac832fe7dcf66db2eb06e76c51da5..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/xrc/xh_bmp.cpp?ds=sidebyside

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index f2c1a15a43..aef57ea0f1 100644
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.cpp
+// Name:        src/xrc/xh_bmp.cpp
 // Purpose:     XRC resource for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_bmp.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,18 +18,21 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
 
 wxBitmapXmlHandler::wxBitmapXmlHandler()
-: wxXmlResourceHandler()
+                   :wxXmlResourceHandler()
 {
 }
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {
-    return new wxBitmap(GetBitmap(wxEmptyString));
+    return new wxBitmap(GetBitmap(m_node));
 }
 
 bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
@@ -50,7 +49,7 @@ wxIconXmlHandler::wxIconXmlHandler()
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {
-    return new wxIcon(GetIcon(wxEmptyString));
+    return new wxIcon(GetIcon(m_node));
 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)