Take advantage of the new ctors accepting a wxArrayString

[wxWidgets.git] / wxPython / src / _listbox.i

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,
     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,
               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...
 
 
     // all generic methods are in wxControlWithItems...
 


@@ -120,19 +122,21 @@ public:
     wxCheckListBox(wxWindow *parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
     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,
                    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);
 
     bool  IsChecked(int index);
     void  Check(int index, int check = True);