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
This commit is contained in:
Robin Dunn
2004-02-03 00:11:31 +00:00
parent b4e7f826af
commit 699e192bcc
6 changed files with 53 additions and 40 deletions

View File

@@ -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();