Fixed some warnings

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index ed74f1d3a1ba0a3ac4cdc10e17309a38945eea52..7f2058cdd24f1646446c8bdf243e379e815f8189 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_bttn.cpp
+// Name:        src/xrc/xh_bttn.cpp

 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resource for buttons
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -15,10 +15,13 @@
     #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"

-#include "wx/button.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/button.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
 


@@ -47,6 +50,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;


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

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