Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 4e61d5074e7b371abaa3ae043bbb2b50f3e869ff..788f50f227993631e3399b23fadf3953c279a187 100644 (file)
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -18,20 +17,21 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
 #if wxUSE_XRC
 
 #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()
 {

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

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


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

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

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