wxTinderbox warning fix.

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

diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index d2c48b42a773c66b4e9080b2d69e63fc4033da96..ed74f1d3a1ba0a3ac4cdc10e17309a38945eea52 100644 (file)
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -7,10 +7,6 @@
 // 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,27 +15,27 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
 
+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 = wxStaticCast(m_instance, wxButton);
-
-   if (!button)
-       button = new wxButton;
+{
+   XRC_MAKE_INSTANCE(button, wxButton)
 
    button->Create(m_parentAsWindow,
                     GetID(),
@@ -49,17 +45,16 @@ 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"));
 }
 
-
+#endif // wxUSE_XRC