From 699e192bccb7bfd8cf69455d2c6786d3da634550 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 3 Feb 2004 00:11:31 +0000 Subject: [PATCH] Take advantage of the new ctors accepting a wxArrayString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_choice.i | 17 +++++++++-------- wxPython/src/_cmndlgs.i | 2 +- wxPython/src/_combobox.i | 18 ++++++++++-------- wxPython/src/_listbox.i | 32 ++++++++++++++++++-------------- wxPython/src/_radio.i | 20 +++++++++++--------- wxPython/src/controls.i | 4 ++++ 6 files changed, 53 insertions(+), 40 deletions(-) diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i index 9b818a61f0..604cf4c897 100644 --- a/wxPython/src/_choice.i +++ b/wxPython/src/_choice.i @@ -17,7 +17,6 @@ MAKE_CONST_WXSTRING(ChoiceNameStr); - //--------------------------------------------------------------------------- %newgroup; @@ -30,19 +29,21 @@ public: wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array=NULL, + //int choices=0, wxString* choices_array=NULL, + const wxArrayString& choices = wxPyEmptyStringArray, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxPyChoiceNameStr); %name(PreChoice)wxChoice(); bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array=NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyChoiceNameStr); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + //int choices=0, wxString* choices_array=NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyChoiceNameStr); #ifndef __WXX11__ int GetColumns(); diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index 59c2f3805f..745d15f1e8 100644 --- a/wxPython/src/_cmndlgs.i +++ b/wxPython/src/_cmndlgs.i @@ -155,7 +155,7 @@ public: wxMultiChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, - int LCOUNT, wxString *choices, + int choices=0, wxString* choices_array, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition); diff --git a/wxPython/src/_combobox.i b/wxPython/src/_combobox.i index 835d2e2be0..da5b396255 100644 --- a/wxPython/src/_combobox.i +++ b/wxPython/src/_combobox.i @@ -35,20 +35,22 @@ public: const wxString& value = wxPyEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array=NULL, + //int choices=0, wxString* choices_array=NULL, + const wxArrayString& choices = wxPyEmptyStringArray, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxPyComboBoxNameStr); %name(PreComboBox)wxComboBox(); bool Create(wxWindow* parent, wxWindowID id, - const wxString& value = wxPyEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array=NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyComboBoxNameStr); + const wxString& value = wxPyEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + //int choices=0, wxString* choices_array=NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyComboBoxNameStr); virtual wxString GetValue() const; diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i index 3b2fb7ddd3..7af5eafdea 100644 --- a/wxPython/src/_listbox.i +++ b/wxPython/src/_listbox.i @@ -35,19 +35,21 @@ public: wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array = NULL, + //int choices=0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxPyListBoxNameStr); %name(PreListBox)wxListBox(); bool Create(wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices=0, wxString* choices_array = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyListBoxNameStr); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + //int choices=0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyListBoxNameStr); // all generic methods are in wxControlWithItems... @@ -120,19 +122,21 @@ public: wxCheckListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices = 0, wxString* choices_array = NULL, + //int choices = 0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxPyListBoxNameStr); %name(PreCheckListBox)wxCheckListBox(); bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices = 0, wxString* choices_array = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyListBoxNameStr); + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + //int choices = 0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyListBoxNameStr); bool IsChecked(int index); void Check(int index, int check = True); diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i index e6974a375f..a2af8d1d71 100644 --- a/wxPython/src/_radio.i +++ b/wxPython/src/_radio.i @@ -33,7 +33,8 @@ public: const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - int choices = 0, wxString* choices_array = NULL, + //int choices = 0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, int majorDimension = 0, long style = wxRA_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, @@ -41,14 +42,15 @@ public: %name(PreRadioBox)wxRadioBox(); bool Create(wxWindow* parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int choices = 0, wxString* choices_array = NULL, - int majorDimension = 0, - long style = wxRA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxPyRadioBoxNameStr); + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + //int choices = 0, wxString* choices_array = NULL, + const wxArrayString& choices = wxPyEmptyStringArray, + int majorDimension = 0, + long style = wxRA_HORIZONTAL, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxPyRadioBoxNameStr); virtual void SetSelection(int n); virtual int GetSelection() const; diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i index 502b4346fc..db14465942 100644 --- a/wxPython/src/controls.i +++ b/wxPython/src/controls.i @@ -30,6 +30,10 @@ MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr); MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr); +%{ + const wxArrayString wxPyEmptyStringArray; +%} + // Include all the files that make up this module -- 2.45.2