X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..284fa852b4b6b1a49b954613326c226f109c28cd:/contrib/src/xrc/xh_bttn.cpp?ds=sidebyside

diff --git a/contrib/src/xrc/xh_bttn.cpp b/contrib/src/xrc/xh_bttn.cpp
index d2c48b42a7..5ed5ee88db 100644
--- a/contrib/src/xrc/xh_bttn.cpp
+++ b/contrib/src/xrc/xh_bttn.cpp
@@ -22,24 +22,22 @@
 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
 
+IMPLEMENT_DYNAMIC_CLASS(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 = wxStaticCast(m_instance, wxButton);
-
-   if (!button)
-       button = new wxButton;
+   XRC_MAKE_INSTANCE(button, wxButton)
 
    button->Create(m_parentAsWindow,
                     GetID(),
@@ -49,17 +47,14 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
                     wxDefaultValidator,
                     GetName());
 
-    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
+    if (GetBool(wxT("default"), 0))
+        button->SetDefault();
     SetupWindow(button);
     
     return button;
 }
 
-
-
 bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }
-
-