X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544fee32eeac1a4f6ca3e0c7c1b13ee24f1d1c1c..9d8fe14a97d1092989eecbe43c4e1f730fba17ad:/src/xrc/xh_choic.cpp?ds=sidebyside diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index e9ff297b64..6a0ccc2566 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_choic.cpp +// Name: src/xrc/xh_choic.cpp // Purpose: XRC resource for wxChoice // Author: Bob Mitchell // Created: 2000/03/21 @@ -7,10 +7,6 @@ // Copyright: (c) 2000 Bob Mitchell and Verant Interactive // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "xh_choic.h" -#endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -19,42 +15,41 @@ #pragma hdrstop #endif +#if wxUSE_XRC && wxUSE_CHOICE + #include "wx/xrc/xh_choic.h" -#include "wx/choice.h" -wxChoiceXmlHandler::wxChoiceXmlHandler() -: wxXmlResourceHandler() , m_insideBox(FALSE) +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/choice.h" +#endif + +IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) + +wxChoiceXmlHandler::wxChoiceXmlHandler() +: wxXmlResourceHandler() , m_insideBox(false) { XRC_ADD_STYLE(wxCB_SORT); AddWindowStyles(); } wxObject *wxChoiceXmlHandler::DoCreateResource() -{ +{ if( m_class == wxT("wxChoice")) { // find the selection long selection = GetLong(wxT("selection"), -1); // need to build the list of strings from children - m_insideBox = TRUE; + m_insideBox = true; CreateChildrenPrivately(NULL, GetParamNode(wxT("content"))); - wxString *strings = (wxString *) NULL; - if (strList.GetCount() > 0) - { - strings = new wxString[strList.GetCount()]; - int count = strList.GetCount(); - for (int i = 0; i < count; i++) - strings[i]=strList[i]; - } XRC_MAKE_INSTANCE(control, wxChoice) control->Create(m_parentAsWindow, GetID(), GetPosition(), GetSize(), - strList.GetCount(), - strings, + strList, GetStyle(), wxDefaultValidator, GetName()); @@ -64,9 +59,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() SetupWindow(control); - if (strings != NULL) - delete[] strings; - strList.Clear(); // dump the strings + strList.Clear(); // dump the strings return control; } @@ -74,9 +67,12 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() { // on the inside now. // 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, m_resource->GetDomain()); + strList.Add(str); return NULL; } @@ -87,3 +83,5 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) return (IsOfClass(node, wxT("wxChoice")) || (m_insideBox && node->GetName() == wxT("item"))); } + +#endif // wxUSE_XRC && wxUSE_CHOICE