another compilation fix after wxCmdLineEntryDesc changes

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

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 181af55af3d8ac59c6e9414d49dbe42a8062fca8..a91318801b5307ebbd3a1e59abfac9d4cffad85c 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bmp.cpp
-// Purpose:     XML resource for wxBitmap and wxIcon
+// 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,42 +15,50 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_bmp.h"
-#include "wx/bitmap.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
+#endif
 
-wxBitmapXmlHandler::wxBitmapXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
+
+wxBitmapXmlHandler::wxBitmapXmlHandler()
+                   :wxXmlResourceHandler()
 {
 }
 
 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)
 {
     return IsOfClass(node, wxT("wxBitmap"));
 }
 
+IMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler)
 
-wxIconXmlHandler::wxIconXmlHandler() 
-: wxXmlResourceHandler() 
+wxIconXmlHandler::wxIconXmlHandler()
+: wxXmlResourceHandler()
 {
 }
 
 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"));
 }
 
+#endif // wxUSE_XRC