Combine two wxImage-to-pixmap creation functions into one.

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

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 085310436078d9cc0046efbaed2add8d7be9c60b..a91318801b5307ebbd3a1e59abfac9d4cffad85c 100644 (file)
--- 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
 // Purpose:     XRC resource for wxBitmap and wxIcon
 // Author:      Vaclav Slavik
 // Created:     2000/09/09


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "xh_bmp.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -19,19 +15,26 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_bmp.h"
 #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()
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
 
 wxBitmapXmlHandler::wxBitmapXmlHandler()

-: wxXmlResourceHandler()
+                   :wxXmlResourceHandler()

 {
 }
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {
 {
 }
 
 wxObject *wxBitmapXmlHandler::DoCreateResource()
 {

-    return new wxBitmap(GetBitmap(wxT("")));
+    // NB: empty parameter name means "take directly from this node's next
+    //     instead of from subnode with given name"
+    return new wxBitmap(GetBitmap(wxEmptyString));

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


@@ -48,10 +51,14 @@ wxIconXmlHandler::wxIconXmlHandler()
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {
 
 wxObject *wxIconXmlHandler::DoCreateResource()
 {

-    return new wxIcon(GetIcon(wxT("")));
+    // NB: empty parameter name means "take directly from this node's next
+    //     instead of from subnode with given name"
+    return new wxIcon(GetIcon(wxEmptyString));

 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxIcon"));
 }
 }
 
 bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxIcon"));
 }

+
+#endif // wxUSE_XRC