The device origin can be set on WinCE, so use it and redefine conversion

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

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index ad56a9add2fb87d5ffd04a05d4f998e2e4cba272..f2c1a15a4386b3d94b2c2a2c6ff05482a0f8c2f9 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_bmp.h"
 #endif
 
 #pragma implementation "xh_bmp.h"
 #endif
 


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

-    return new wxBitmap(GetBitmap(wxT("")));
+    return new wxBitmap(GetBitmap(wxEmptyString));

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


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

-    return new wxIcon(GetIcon(wxT("")));
+    return new wxIcon(GetIcon(wxEmptyString));

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