Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index 397c6dbe472903c446312d4b3fed148e12e16896..963efd0848b238e1f0cabfb868a20eb0ac776f54 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_BUTTON
 
 #include "wx/xrc/xh_bttn.h"
 
@@ -50,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;
@@ -60,4 +92,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxButton"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_BUTTON