X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5d6954b87d910969226ffade9714db7429211f3..4a46a5df879c4f820d0a0a435b34c7d5e4793991:/src/xrc/xh_sttxt.cpp?ds=sidebyside diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp index 63f941fb8e..955642ed64 100644 --- a/src/xrc/xh_sttxt.cpp +++ b/src/xrc/xh_sttxt.cpp @@ -25,32 +25,30 @@ wxStaticTextXmlHandler::wxStaticTextXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxST_NO_AUTORESIZE); - ADD_STYLE(wxALIGN_LEFT); - ADD_STYLE(wxALIGN_RIGHT); - ADD_STYLE(wxALIGN_CENTRE); + XRC_ADD_STYLE(wxST_NO_AUTORESIZE); + XRC_ADD_STYLE(wxALIGN_LEFT); + XRC_ADD_STYLE(wxALIGN_RIGHT); + XRC_ADD_STYLE(wxALIGN_CENTRE); AddWindowStyles(); } wxObject *wxStaticTextXmlHandler::DoCreateResource() { - wxStaticText *text = new wxStaticText(m_parentAsWindow, - GetID(), - GetText(wxT("label")), - GetPosition(), GetSize(), - GetStyle(), - GetName() - ); + XRC_MAKE_INSTANCE(text, wxStaticText) + + text->Create(m_parentAsWindow, + GetID(), + GetText(wxT("label")), + GetPosition(), GetSize(), + GetStyle(), + GetName()); + SetupWindow(text); return text; } - - bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxStaticText")); } - -