wxGTK1 : wx/private/eventloopsourcesmanager.h was missing in evtloop.cpp

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index d391e8ea2beb4f56be748dea14e17e491326f6bd..fea736044b2d189792eb94b1813019223d78086e 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -1,17 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bttn.cpp
+// Name:        src/xrc/xh_bttn.cpp
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_bttn.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,10 +14,13 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC && wxUSE_BUTTON
 
 #include "wx/xrc/xh_bttn.h"
-#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
 
@@ -51,6 +49,13 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
 
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
+
+    if ( GetParamNode("bitmap") )
+    {
+        button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON),
+                          GetDirection("bitmapposition"));
+    }
+
     SetupWindow(button);
 
     return button;
@@ -61,4 +66,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxButton"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_BUTTON