X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2dc104421c340091342156d6b01f61f1ccff438..1b35fec738ef02e1d0a5419466c42ccbb13b6676:/wxPython/src/_choice.i

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index 366cc4e308..604cf4c897 100644
--- a/wxPython/src/_choice.i
+++ b/wxPython/src/_choice.i
@@ -17,35 +17,38 @@
 
 MAKE_CONST_WXSTRING(ChoiceNameStr);
 
-
 //---------------------------------------------------------------------------
 %newgroup;
 
 class wxChoice : public wxControlWithItems
 {
 public:
-    %addtofunc wxChoice         "self._setOORInfo(self)"
-    %addtofunc wxChoice()       ""
+    %pythonAppend wxChoice         "self._setOORInfo(self)"
+    %pythonAppend wxChoice()       ""
 
     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();
     void SetColumns(const int n = 1);
+#endif
     void SetSelection(const int n);
     void SetStringSelection(const wxString& string);
     void SetString(int n, const wxString& s);