check for m_parentAsWindow!=NULL

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

diff --git a/contrib/src/xrc/xh_bttn.cpp b/contrib/src/xrc/xh_bttn.cpp
index d2c48b42a773c66b4e9080b2d69e63fc4033da96..5ed5ee88db3dfd3f2cb4f39582fd2e97e0ac1778 100644 (file)
--- 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"
 
 #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();
 }
 
     AddWindowStyles();
 }
 

-

 wxObject *wxButtonXmlHandler::DoCreateResource()
 { 
 wxObject *wxButtonXmlHandler::DoCreateResource()
 { 

-   wxButton *button = wxStaticCast(m_instance, wxButton);
-
-   if (!button)
-       button = new wxButton;
+   XRC_MAKE_INSTANCE(button, wxButton)

 
    button->Create(m_parentAsWindow,
                     GetID(),
 
    button->Create(m_parentAsWindow,
                     GetID(),


@@ -49,17 +47,14 @@ wxObject *wxButtonXmlHandler::DoCreateResource()
                     wxDefaultValidator,
                     GetName());
 
                     wxDefaultValidator,
                     GetName());
 

-    if (GetBool(wxT("default"), 0) == 1) button->SetDefault();
+    if (GetBool(wxT("default"), 0))
+        button->SetDefault();

     SetupWindow(button);
     
     return button;
 }
 
     SetupWindow(button);
     
     return button;
 }
 

-
-

 bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }
 bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxButton"));
 }

-
-