From 187d815255d240350c598721db1e0c1b4d3fb527 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Oct 2006 22:12:32 +0000 Subject: [PATCH] there is no need to convert wxArrayString to wxString[] explicitly any more, wx controls accept wxArrayString directly now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/xrc/xh_chckl.cpp | 16 +++------------- src/xrc/xh_choic.cpp | 13 +------------ src/xrc/xh_combo.cpp | 13 +------------ src/xrc/xh_listb.cpp | 20 +++++--------------- src/xrc/xh_odcombo.cpp | 19 ++++--------------- 5 files changed, 14 insertions(+), 67 deletions(-) diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp index f4e354ec5e..e13a117b5a 100644 --- 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 04b726e7c0..6a0ccc2566 100644 --- 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 99c0370559..da2040909c 100644 --- 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 a319449d20..fb92aeae16 100644 --- 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 8f5d6d2705..3093395902 100644 --- 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; -- 2.45.2