there is no need to convert wxArrayString to wxString[] explicitly any more, wx contr...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index f4e354ec5e3868aaa4723a69832c03a452d08db3..e13a117b5ab6cbde10002419d0c6cbcd1ed84fa1 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -57,29 +57,21 @@ wxObject *wxCheckListBoxXmlHandler::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, wxCheckListBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
                         GetPosition(), GetSize(),
-                        strList.GetCount(),
-                        strings,
+                        strList,
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
 
         // step through children myself (again.)
         wxXmlNode *n = GetParamNode(wxT("content"));
-        if (n) n = n->GetChildren();
+        if (n)
+            n = n->GetChildren();
         int i = 0;
         while (n)
         {
@@ -99,8 +91,6 @@ wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
-        if (strings != NULL)
-            delete[] strings;
         strList.Clear();    // dump the strings
 
         return control;

diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 04b726e7c05eb14f27eb185ca9536f4d6ee9131b..6a0ccc2566a834ce8e99428858d6b782c1b5d518 100644 (file)
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -43,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());
@@ -68,8 +59,6 @@ wxObject *wxChoiceXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
-        if (strings != NULL)
-            delete[] strings;
         strList.Clear();    // dump the strings
 
         return control;

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 99c037055926eb8a44a5e64a45b0808eeca8ad70..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")));
-        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)
 
@@ -62,8 +54,7 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
                         GetID(),
                         GetText(wxT("value")),
                         GetPosition(), GetSize(),
-                        strList.GetCount(),
-                        strings,
+                        strList,
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
@@ -73,8 +64,6 @@ wxObject *wxComboBoxXmlHandler::DoCreateResource()
 
         SetupWindow(control);
 
-        if (strings != NULL)
-            delete[] strings;
         strList.Clear();    // dump the strings
 
         return control;

diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index a319449d20ccc2e3d87311c7b679d70e49462009..fb92aeae16844bfd3c5c3b76fabb3ba3cf4a6581 100644 (file)
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -27,7 +27,8 @@
 IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
 
 wxListBoxXmlHandler::wxListBoxXmlHandler()
-: wxXmlResourceHandler() , m_insideBox(false)
+                   : wxXmlResourceHandler(),
+                     m_insideBox(false)
 {
     XRC_ADD_STYLE(wxLB_SINGLE);
     XRC_ADD_STYLE(wxLB_MULTIPLE);
@@ -41,7 +42,7 @@ wxListBoxXmlHandler::wxListBoxXmlHandler()
 
 wxObject *wxListBoxXmlHandler::DoCreateResource()
 {
-    if( m_class == wxT("wxListBox"))
+    if ( m_class == wxT("wxListBox"))
     {
         // find the selection
         long selection = GetLong(wxT("selection"), -1);
@@ -49,22 +50,14 @@ wxObject *wxListBoxXmlHandler::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];
-        }
+        m_insideBox = false;
 
         XRC_MAKE_INSTANCE(control, wxListBox)
 
         control->Create(m_parentAsWindow,
                         GetID(),
                         GetPosition(), GetSize(),
-                        strList.GetCount(),
-                        strings,
+                        strList,
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
@@ -73,9 +66,6 @@ wxObject *wxListBoxXmlHandler::DoCreateResource()
             control->SetSelection(selection);
 
         SetupWindow(control);
-
-        if (strings != NULL)
-            delete[] strings;
         strList.Clear();    // dump the strings
 
         return control;

diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp
index 8f5d6d27058f7e1c52aae9ea9411a8abe0ceafa4..3093395902db113df23c1d312d01b013be975933 100644 (file)
--- a/src/xrc/xh_odcombo.cpp
+++ b/src/xrc/xh_odcombo.cpp
@@ -52,14 +52,6 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::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, wxOwnerDrawnComboBox)
 
@@ -67,24 +59,21 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::DoCreateResource()
                         GetID(),
                         GetText(wxT("value")),
                         GetPosition(), GetSize(),
-                        strList.GetCount(),
-                        strings,
+                        strList,
                         GetStyle(),
                         wxDefaultValidator,
                         GetName());
 
-        wxSize ButtonSize=GetSize(wxT("buttonsize"));
+        wxSize sizeBtn=GetSize(wxT("buttonsize"));
 
-        if (ButtonSize != wxDefaultSize)
-        control->SetButtonPosition(ButtonSize.GetWidth(), ButtonSize.GetHeight());
+        if (sizeBtn != wxDefaultSize)
+            control->SetButtonPosition(sizeBtn.GetWidth(), sizeBtn.GetHeight());
 
         if (selection != -1)
             control->SetSelection(selection);
 
         SetupWindow(control);
 
-        if (strings != NULL)
-            delete[] strings;
         strList.Clear();    // dump the strings
 
         return control;