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

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index 397c6dbe472903c446312d4b3fed148e12e16896..fea736044b2d189792eb94b1813019223d78086e 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -3,7 +3,6 @@
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05

-// RCS-ID:      $Id$

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


@@ -15,7 +14,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_BUTTON

 
 #include "wx/xrc/xh_bttn.h"
 
 
 #include "wx/xrc/xh_bttn.h"
 


@@ -50,6 +49,13 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
 
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
 
     if (GetBool(wxT("default"), 0))
         button->SetDefault();

+
+    if ( GetParamNode("bitmap") )
+    {
+        button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON),
+                          GetDirection("bitmapposition"));
+    }
+

     SetupWindow(button);
 
     return button;
     SetupWindow(button);
 
     return button;


@@ -60,4 +66,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxButton"));
 }
 
     return IsOfClass(node, wxT("wxButton"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_BUTTON