X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78d14f80e9a72041ede52c30d912ec5cef21b1b3..24f932d22a085ce899b94c98578f475782c75bf6:/src/xrc/xh_text.cpp diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp index 26d8510c90..a2d360643c 100644 --- a/src/xrc/xh_text.cpp +++ b/src/xrc/xh_text.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: xh_text.cpp -// Purpose: XML resource for wxTextCtrl +// Purpose: XRC resource for wxTextCtrl // Author: Aleksandras Gluchovas // Created: 2000/03/21 // RCS-ID: $Id$ @@ -24,35 +24,33 @@ wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() { - ADD_STYLE(wxTE_PROCESS_ENTER); - ADD_STYLE(wxTE_PROCESS_TAB); - ADD_STYLE(wxTE_MULTILINE); - ADD_STYLE(wxTE_PASSWORD); - ADD_STYLE(wxTE_READONLY); - ADD_STYLE(wxHSCROLL); + XRC_ADD_STYLE(wxTE_PROCESS_ENTER); + XRC_ADD_STYLE(wxTE_PROCESS_TAB); + XRC_ADD_STYLE(wxTE_MULTILINE); + XRC_ADD_STYLE(wxTE_PASSWORD); + XRC_ADD_STYLE(wxTE_READONLY); + XRC_ADD_STYLE(wxHSCROLL); AddWindowStyles(); } wxObject *wxTextCtrlXmlHandler::DoCreateResource() { - wxTextCtrl *text = new wxTextCtrl(m_parentAsWindow, - GetID(), - GetText(wxT("value")), - GetPosition(), GetSize(), - GetStyle(), - wxDefaultValidator, - GetName() - ); + XRC_MAKE_INSTANCE(text, wxTextCtrl) + + text->Create(m_parentAsWindow, + GetID(), + GetText(wxT("value")), + GetPosition(), GetSize(), + GetStyle(), + wxDefaultValidator, + GetName()); + SetupWindow(text); return text; } - - bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node) { return IsOfClass(node, wxT("wxTextCtrl")); } - -