X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..16c587ca765d00a17eb4fe83f6d94901a08801a4:/src/xrc/xh_bttn.cpp?ds=sidebyside diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp index 1a0a7486ef..5ed5ee88db 100644 --- a/src/xrc/xh_bttn.cpp +++ b/src/xrc/xh_bttn.cpp @@ -22,38 +22,39 @@ #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 = 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(); SetupWindow(button); return button; } - - bool wxButtonXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxButton")); } - -