X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f25881804583790351480098b50f4ce1b924e697..31d7fc0f9cb3f5913ecd4a039a816487a6753a93:/contrib/src/xrc/xh_choic.cpp?ds=inline diff --git a/contrib/src/xrc/xh_choic.cpp b/contrib/src/xrc/xh_choic.cpp index 4de735f9d2..15f7c6a77c 100644 --- a/contrib/src/xrc/xh_choic.cpp +++ b/contrib/src/xrc/xh_choic.cpp @@ -21,11 +21,14 @@ #include "wx/xrc/xh_choic.h" #include "wx/choice.h" +#include "wx/intl.h" + +IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) wxChoiceXmlHandler::wxChoiceXmlHandler() : wxXmlResourceHandler() , m_insideBox(FALSE) { - ADD_STYLE(wxCB_SORT); + XRC_ADD_STYLE(wxCB_SORT); AddWindowStyles(); } @@ -34,24 +37,21 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() if( m_class == wxT("wxChoice")) { // find the selection - long selection = GetLong( wxT("selection"), -1 ); + long selection = GetLong(wxT("selection"), -1); // need to build the list of strings from children m_insideBox = TRUE; - CreateChildrenPrivately( NULL, GetParamNode(wxT("content"))); + CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); wxString *strings = (wxString *) NULL; - if( strList.GetCount() > 0 ) + if (strList.GetCount() > 0) { strings = new wxString[strList.GetCount()]; int count = strList.GetCount(); - for( int i = 0; i < count; i++ ) + for (int i = 0; i < count; i++) strings[i]=strList[i]; } - wxChoice *control = wxStaticCast(m_instance, wxChoice); - - if (!control) - control = new wxChoice; + XRC_MAKE_INSTANCE(control, wxChoice) control->Create(m_parentAsWindow, GetID(), @@ -62,13 +62,13 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() wxDefaultValidator, GetName()); - if( selection != -1 ) - control->SetSelection( selection ); + if (selection != -1) + control->SetSelection(selection); SetupWindow(control); - if( strings != NULL ) - delete [] strings; + if (strings != NULL) + delete[] strings; strList.Clear(); // dump the strings return control; @@ -79,20 +79,17 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() // handle Label // add to the list - strList.Add( GetNodeContent(m_node) ); + wxString str = GetNodeContent(m_node); + if (m_resource->GetFlags() & wxXRC_USE_LOCALE) + str = wxGetTranslation(str); + strList.Add(str); return NULL; } - } - - bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) { return (IsOfClass(node, wxT("wxChoice")) || - (m_insideBox && node->GetName() == wxT("item")) - ); + (m_insideBox && node->GetName() == wxT("item"))); } - -