X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ea77b4a8bac4ab005bfc592f9cd3262ffa397..f23b8c0d859cf01e91ed38a9f8b79c2ebc534f47:/src/xrc/xh_bttn.cpp

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index 0733bd6f6f..963efd0848 100644
--- 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
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_bttn.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,8 +15,13 @@
     #pragma hdrstop
 #endif
 
+#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)
 
@@ -49,6 +50,38 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
 
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
+
+    if ( GetParamNode("bitmap") )
+    {
+        wxDirection dir;
+        const wxString dirstr = GetParamValue("direction");
+        if ( dirstr.empty() || dirstr == "wxLEFT" )
+            dir = wxLEFT;
+        else if ( dirstr == "wxRIGHT" )
+            dir = wxRIGHT;
+        else if ( dirstr == "wxTOP" )
+            dir = wxTOP;
+        else if ( dirstr == "wxBOTTOM" )
+            dir = wxBOTTOM;
+        else
+        {
+            ReportError
+            (
+                GetParamNode("bitmapposition"),
+                wxString::Format
+                (
+                    "Invalid bitmap position \"%s\": must be one of "
+                    "wxLEFT|wxRIGHT|wxTOP|wxBOTTOM.",
+                    dirstr
+                )
+            );
+
+            dir = wxLEFT;
+        }
+
+        button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON), dir);
+    }
+
     SetupWindow(button);
 
     return button;
@@ -58,3 +91,5 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }
+
+#endif // wxUSE_XRC && wxUSE_BUTTON