consistently use ExtractLang() everywhere instead of Left/Mid wxString methods; added...

[wxWidgets.git] / src / xrc / xh_choic.cpp

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index c6ad605176caa2d5388d2c5139211fd1cc3fa5b9..6a0ccc2566a834ce8e99428858d6b782c1b5d518 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -22,7 +22,6 @@
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/choice.h"
-    #include "wx/combobox.h"
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
@@ -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;