Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take advantage of the new ctors accepting a wxArrayString

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

17
wxPython/src/_choice.i
View File

@@ -17,7 +17,6 @@
MAKE_CONST_WXSTRING(ChoiceNameStr); MAKE_CONST_WXSTRING(ChoiceNameStr);
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
%newgroup; %newgroup;
@@ -30,19 +29,21 @@ public:
wxChoice(wxWindow *parent, wxWindowID id, wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyChoiceNameStr); const wxString& name = wxPyChoiceNameStr);
%name(PreChoice)wxChoice(); %name(PreChoice)wxChoice();
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int choices=0, wxString* choices_array=NULL, //int choices=0, wxString* choices_array=NULL,
long style = 0, const wxArrayString& choices = wxPyEmptyStringArray,
const wxValidator& validator = wxDefaultValidator, long style = 0,
const wxString& name = wxPyChoiceNameStr); const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyChoiceNameStr);
#ifndef __WXX11__ #ifndef __WXX11__
int GetColumns(); int GetColumns();

2
wxPython/src/_cmndlgs.i
View File

@@ -155,7 +155,7 @@ public:
wxMultiChoiceDialog(wxWindow *parent, wxMultiChoiceDialog(wxWindow *parent,
const wxString& message, const wxString& message,
const wxString& caption, const wxString& caption,
int LCOUNT, wxString *choices, int choices=0, wxString* choices_array,
long style = wxCHOICEDLG_STYLE, long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);

18
wxPython/src/_combobox.i
View File

@@ -35,20 +35,22 @@ public:
const wxString& value = wxPyEmptyString, const wxString& value = wxPyEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyComboBoxNameStr); const wxString& name = wxPyComboBoxNameStr);
%name(PreComboBox)wxComboBox(); %name(PreComboBox)wxComboBox();
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxString& value = wxPyEmptyString, const wxString& value = wxPyEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int choices=0, wxString* choices_array=NULL, //int choices=0, wxString* choices_array=NULL,
long style = 0, const wxArrayString& choices = wxPyEmptyStringArray,
const wxValidator& validator = wxDefaultValidator, long style = 0,
const wxString& name = wxPyComboBoxNameStr); const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyComboBoxNameStr);
virtual wxString GetValue() const; virtual wxString GetValue() const;

32
wxPython/src/_listbox.i
View File

@@ -35,19 +35,21 @@ public:
wxListBox(wxWindow* parent, wxWindowID id, wxListBox(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyListBoxNameStr); const wxString& name = wxPyListBoxNameStr);
%name(PreListBox)wxListBox(); %name(PreListBox)wxListBox();
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int choices=0, wxString* choices_array = NULL, //int choices=0, wxString* choices_array = NULL,
long style = 0, const wxArrayString& choices = wxPyEmptyStringArray,
const wxValidator& validator = wxDefaultValidator, long style = 0,
const wxString& name = wxPyListBoxNameStr); 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, wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyListBoxNameStr); const wxString& name = wxPyListBoxNameStr);
%name(PreCheckListBox)wxCheckListBox(); %name(PreCheckListBox)wxCheckListBox();
bool Create(wxWindow *parent, wxWindowID id, bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int choices = 0, wxString* choices_array = NULL, //int choices = 0, wxString* choices_array = NULL,
long style = 0, const wxArrayString& choices = wxPyEmptyStringArray,
const wxValidator& validator = wxDefaultValidator, long style = 0,
const wxString& name = wxPyListBoxNameStr); const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyListBoxNameStr);
bool IsChecked(int index); bool IsChecked(int index);
void Check(int index, int check = True); void Check(int index, int check = True);

20
wxPython/src/_radio.i
View File

@@ -33,7 +33,8 @@ public:
const wxString& label, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, 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, int majorDimension = 0,
long style = wxRA_HORIZONTAL, long style = wxRA_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
@@ -41,14 +42,15 @@ public:
%name(PreRadioBox)wxRadioBox(); %name(PreRadioBox)wxRadioBox();
bool Create(wxWindow* parent, wxWindowID id, bool Create(wxWindow* parent, wxWindowID id,
const wxString& label, const wxString& label,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int choices = 0, wxString* choices_array = NULL, //int choices = 0, wxString* choices_array = NULL,
int majorDimension = 0, const wxArrayString& choices = wxPyEmptyStringArray,
long style = wxRA_HORIZONTAL, int majorDimension = 0,
const wxValidator& validator = wxDefaultValidator, long style = wxRA_HORIZONTAL,
const wxString& name = wxPyRadioBoxNameStr); const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxPyRadioBoxNameStr);
virtual void SetSelection(int n); virtual void SetSelection(int n);
virtual int GetSelection() const; virtual int GetSelection() const;

4
wxPython/src/controls.i
View File

@@ -30,6 +30,10 @@ MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
MAKE_CONST_WXSTRING_NOSWIG(EmptyString); MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr); MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr);
%{
const wxArrayString wxPyEmptyStringArray;
%}
// Include all the files that make up this module // Include all the files that make up this module