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

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index 9b818a61f007627db79c499351db0a64c0e766c0..604cf4c8972c2cb4c3f89c4a968900a5e59fa263 100644 (file)
--- 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 59c2f3805fcaf06a3bb6b3778d06dea0a844e239..745d15f1e89ff1b2ab8bc362668f2c9d0b50e4f7 100644 (file)
--- 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 835d2e2be015042d50742aeb424d1569fc43dc5b..da5b396255df849a8b655d133b3eebcdbabd5ed3 100644 (file)
--- 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 3b2fb7ddd34ec7df6735b18c55be4940bd772501..7af5eafdea9098b84f61f52735b0486e649234db 100644 (file)
--- 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 e6974a375f39eda6b7119c79b9af01dd6f0e46c4..a2af8d1d71dcff66ef7ca05948b02eec0c9e035c 100644 (file)
--- 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 502b4346fcc8d6a40084be3c5fa9312348b8e6f8..db144659424cae500f6898767332168345b47b34 100644 (file)
--- 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