can't pass objects through ... (please don't ever ignore this gcc warning)

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

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 0e4955031cf6c5fb4cbdd760256222e749825221..4e61d5074e7b371abaa3ae043bbb2b50f3e869ff 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,18 +15,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
 
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
 

+IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)

 
 

-wxBitmapXmlHandler::wxBitmapXmlHandler() 
-: wxXmlResourceHandler() 
+wxBitmapXmlHandler::wxBitmapXmlHandler()
+: 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)


@@ -38,17 +39,23 @@ bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmap"));
 }
 
     return IsOfClass(node, wxT("wxBitmap"));
 }
 

-wxIconXmlHandler::wxIconXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler)
+
+wxIconXmlHandler::wxIconXmlHandler()
+: wxXmlResourceHandler()

 {
 }
 
 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