X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..1d529ef7eed851db9d007821decb9639e4e7fc16:/contrib/src/xrc/xh_text.cpp?ds=sidebyside diff --git a/contrib/src/xrc/xh_text.cpp b/contrib/src/xrc/xh_text.cpp index 8a77e6ae7b..4d4e88413a 100644 --- a/contrib/src/xrc/xh_text.cpp +++ b/contrib/src/xrc/xh_text.cpp @@ -22,42 +22,47 @@ #include "wx/xrc/xh_text.h" #include "wx/textctrl.h" +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler) + 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); + XRC_ADD_STYLE(wxTE_RICH); + XRC_ADD_STYLE(wxTE_RICH2); + XRC_ADD_STYLE(wxTE_AUTO_URL); + XRC_ADD_STYLE(wxTE_NOHIDESEL); + XRC_ADD_STYLE(wxTE_LEFT); + XRC_ADD_STYLE(wxTE_CENTRE); + XRC_ADD_STYLE(wxTE_RIGHT); + XRC_ADD_STYLE(wxTE_DONTWRAP); + XRC_ADD_STYLE(wxTE_LINEWRAP); + XRC_ADD_STYLE(wxTE_WORDWRAP); AddWindowStyles(); } wxObject *wxTextCtrlXmlHandler::DoCreateResource() { - wxTextCtrl *text = wxStaticCast(m_instance, wxTextCtrl); - - if ( !text ) - text = new wxTextCtrl; + XRC_MAKE_INSTANCE(text, wxTextCtrl) - text->Create( m_parentAsWindow, - GetID(), - GetText(wxT("value")), - GetPosition(), GetSize(), - GetStyle(), - wxDefaultValidator, - GetName() ); + 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")); } - -