check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 6950cfc1988bcd7d775532b06c142261c6273a5e..da2040909cec70fbac60bb884330bc1e95203f0f 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -47,14 +47,6 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // need to build the list of strings from children
         m_insideBox = true;
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         // 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, wxComboBox)
 
 
         XRC_MAKE_INSTANCE(control, wxComboBox)
 


@@ -62,8 +54,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
                         GetID(),
                         GetText(wxT("value")),
                         GetPosition(), GetSize(),
                         GetID(),
                         GetText(wxT("value")),
                         GetPosition(), GetSize(),

-                        strList.GetCount(),
-                        strings,
+                        strList,

                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());


@@ -73,8 +64,6 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
 
         SetupWindow(control);
 

-        if (strings != NULL)
-            delete[] strings;

         strList.Clear();    // dump the strings
 
         return control;
         strList.Clear();    // dump the strings
 
         return control;


@@ -87,7 +76,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
         // add to the list
         wxString str = GetNodeContent(m_node);
         if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
         // 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;
         strList.Add(str);
 
         return NULL;