X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da86e1776517d2403a687de08947698f5a608219..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/xrc/xh_bmp.cpp?ds=sidebyside

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index ab18f0acb3..788f50f227 100644
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -1,17 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.cpp
+// Name:        src/xrc/xh_bmp.cpp
 // Purpose:     XRC resource for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_bmp.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,21 +14,24 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#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(wxT("")));
+    return new wxBitmap(GetBitmap(m_node));
 }
 
 bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
@@ -50,7 +48,7 @@ wxIconXmlHandler::wxIconXmlHandler()
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {
-    return new wxIcon(GetIcon(wxT("")));
+    return new wxIcon(GetIcon(m_node));
 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
@@ -58,4 +56,4 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxIcon"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC