X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da86e1776517d2403a687de08947698f5a608219..de9a407728e5f47ed416365da9c07798ad0b0b26:/src/xrc/xh_bmp.cpp

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index ab18f0acb3..f2c1a15a43 100644
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_bmp.h"
 #endif
 
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
@@ -33,7 +33,7 @@ wxBitmapXmlHandler::wxBitmapXmlHandler()
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {
-    return new wxBitmap(GetBitmap(wxT("")));
+    return new wxBitmap(GetBitmap(wxEmptyString));
 }
 
 bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
@@ -50,7 +50,7 @@ wxIconXmlHandler::wxIconXmlHandler()
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {
-    return new wxIcon(GetIcon(wxT("")));
+    return new wxIcon(GetIcon(wxEmptyString));
 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
@@ -58,4 +58,4 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxIcon"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC