Merged the wxPy_newswig branch into the HEAD branch (main trunk)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/_choice.i

@@ -0,0 +1,59 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        _choice.i
+// Purpose:     SWIG interface defs for wxChoice
+//
+// Author:      Robin Dunn
+//
+// Created:     10-June-1998
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// Not a %module
+
+
+//---------------------------------------------------------------------------
+
+%{
+    DECLARE_DEF_STRING(ChoiceNameStr);
+%}
+
+//---------------------------------------------------------------------------
+%newgroup;
+
+class wxChoice : public wxControlWithItems
+{
+public:
+    %addtofunc wxChoice         "self._setOORInfo(self)"
+    %addtofunc wxChoice()       ""
+
+    wxChoice(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);
+    %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);
+
+    int GetColumns();
+    void SetColumns(const int n = 1);
+    void SetSelection(const int n);
+    void SetStringSelection(const wxString& string);
+    void SetString(int n, const wxString& s);
+
+    %pragma(python) addtoclass = "
+    Select = SetSelection
+    "
+};
+
+//---------------------------------------------------------------------------