Baked files with Bakefile 0.1.1 using Python 2.3

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

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index 1f068a508533d61561bc7d93194fea05322ae349..49eec5186f7319b935432d140eb85bceae924034 100644 (file)
--- a/wxPython/src/_choice.i
+++ b/wxPython/src/_choice.i
@@ -15,9 +15,8 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(ChoiceNameStr);
-%}
+MAKE_CONST_WXSTRING(ChoiceNameStr);
+
 
 //---------------------------------------------------------------------------
 %newgroup;
@@ -45,8 +44,10 @@ public:
              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);