X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..eeea3b039ef9bf03c17f80ab911cf65f084731bd:/src/xrc/xh_bttn.cpp

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index ab6d6f7b1c..963efd0848 100644
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_bttn.cpp
-// Purpose:     XML resource for buttons
+// 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,41 +15,81 @@
     #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)
 
-wxButtonXmlHandler::wxButtonXmlHandler() 
-: wxXmlResourceHandler() 
+wxButtonXmlHandler::wxButtonXmlHandler()
+: wxXmlResourceHandler()
 {
-    ADD_STYLE(wxBU_LEFT);
-    ADD_STYLE(wxBU_RIGHT);
-    ADD_STYLE(wxBU_TOP);
-    ADD_STYLE(wxBU_BOTTOM);
+    XRC_ADD_STYLE(wxBU_LEFT);
+    XRC_ADD_STYLE(wxBU_RIGHT);
+    XRC_ADD_STYLE(wxBU_TOP);
+    XRC_ADD_STYLE(wxBU_BOTTOM);
+    XRC_ADD_STYLE(wxBU_EXACTFIT);
     AddWindowStyles();
 }
 
-
 wxObject *wxButtonXmlHandler::DoCreateResource()
-{ 
-    wxButton *button = new wxButton(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName());
-    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
+{
+   XRC_MAKE_INSTANCE(button, wxButton)
+
+   button->Create(m_parentAsWindow,
+                    GetID(),
+                    GetText(wxT("label")),
+                    GetPosition(), GetSize(),
+                    GetStyle(),
+                    wxDefaultValidator,
+                    GetName());
+
+    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;
 }
 
-
-
 bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }
 
-
+#endif // wxUSE_XRC && wxUSE_BUTTON