X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..a6328131cd431ccecb931ba98cb8f4567576683a:/src/xrc/xh_bmp.cpp

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index c7a1ed9b5a..f2c1a15a43 100644
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_bmp.h"
 #endif
 
@@ -19,19 +19,21 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
 
-wxBitmapXmlHandler::wxBitmapXmlHandler() 
-: wxXmlResourceHandler() 
+wxBitmapXmlHandler::wxBitmapXmlHandler()
+: wxXmlResourceHandler()
 {
 }
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
-{ 
-    return new wxBitmap(GetBitmap(wxT("")));
+{
+    return new wxBitmap(GetBitmap(wxEmptyString));
 }
 
 bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
@@ -41,17 +43,19 @@ bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
 
 IMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler)
 
-wxIconXmlHandler::wxIconXmlHandler() 
-: wxXmlResourceHandler() 
+wxIconXmlHandler::wxIconXmlHandler()
+: wxXmlResourceHandler()
 {
 }
 
 wxObject *wxIconXmlHandler::DoCreateResource()
-{ 
-    return new wxIcon(GetIcon(wxT("")));
+{
+    return new wxIcon(GetIcon(wxEmptyString));
 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxIcon"));
 }
+
+#endif // wxUSE_XRC