X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..56acdfef2f2759bbc03c2fab5f7da25f6ca6d563:/contrib/src/xrc/xh_sttxt.cpp diff --git a/contrib/src/xrc/xh_sttxt.cpp b/contrib/src/xrc/xh_sttxt.cpp index 7aba85fda8..955642ed64 100644 --- a/contrib/src/xrc/xh_sttxt.cpp +++ b/contrib/src/xrc/xh_sttxt.cpp @@ -25,19 +25,16 @@ 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 = wxStaticCast(m_instance, wxStaticText); - - if (!text) - text = new wxStaticText; + XRC_MAKE_INSTANCE(text, wxStaticText) text->Create(m_parentAsWindow, GetID(), @@ -51,11 +48,7 @@ wxObject *wxStaticTextXmlHandler::DoCreateResource() return text; } - - bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxStaticText")); } - -