X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a7a4e10ed18f81a576dcd866cfbf02bf404c00..9d8fe14a97d1092989eecbe43c4e1f730fba17ad:/src/xrc/xh_choic.cpp?ds=sidebyside diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp index a3903f7836..6a0ccc2566 100644 --- a/src/xrc/xh_choic.cpp +++ b/src/xrc/xh_choic.cpp @@ -15,16 +15,15 @@ #pragma hdrstop #endif -#if wxUSE_XRC +#if wxUSE_XRC && wxUSE_CHOICE #include "wx/xrc/xh_choic.h" #ifndef WX_PRECOMP #include "wx/intl.h" + #include "wx/choice.h" #endif -#include "wx/choice.h" - IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler) wxChoiceXmlHandler::wxChoiceXmlHandler() @@ -44,22 +43,13 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() // need to build the list of strings from children 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()); @@ -69,8 +59,6 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() SetupWindow(control); - if (strings != NULL) - delete[] strings; strList.Clear(); // dump the strings return control; @@ -83,7 +71,7 @@ wxObject *wxChoiceXmlHandler::DoCreateResource() // add to the list wxString str = GetNodeContent(m_node); if (m_resource->GetFlags() & wxXRC_USE_LOCALE) - str = wxGetTranslation(str); + str = wxGetTranslation(str, m_resource->GetDomain()); strList.Add(str); return NULL; @@ -96,4 +84,4 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node) (m_insideBox && node->GetName() == wxT("item"))); } -#endif // wxUSE_XRC +#endif // wxUSE_XRC && wxUSE_CHOICE