minimal now works in Unicode mode

[wxWidgets.git] / utils / wxPython / src / controls.i

diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i
index 7b5098130ef2db915cf91e6ff46c90e907f351e9..cc606fec8b7cc80dd910d67ebf0195cddffb0eb5 100644 (file)
--- a/utils/wxPython/src/controls.i
+++ b/utils/wxPython/src/controls.i
@@ -22,6 +22,10 @@
 #include <wx/checklst.h>
 #endif
 #endif
 #include <wx/checklst.h>
 #endif
 #endif

+
+#ifdef __WXGTK__
+#include <wx/checklst.h>
+#endif

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -400,19 +404,19 @@ public:
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 
 
     %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
 

-    %name(EnableBox)void Enable(bool enable);
-    void Enable(int n, bool enable);
+    void Enable(bool enable);
+    %name(EnableItem)void Enable(int n, bool enable);

     int FindString(const wxString& string);
 #ifdef __WXMSW__
     int FindString(const wxString& string);
 #ifdef __WXMSW__

-    %name(GetBoxLabel)wxString GetLabel();
+    wxString GetLabel();

 #endif
 #endif

-    wxString GetLabel(int n);
+    %name(GetItemLabel)wxString GetLabel(int n);

     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();
     int GetSelection();
     wxString GetString(int n);
     wxString GetStringSelection();
     int Number();

-    %name(SetBoxLabel)void SetLabel(const wxString& label);
-    void SetLabel(int n, const wxString& label);
+    void SetLabel(const wxString& label);
+    %name(SetItemLabel)void SetLabel(int n, const wxString& label);

     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);


@@ -479,7 +483,17 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// Revision 1.11  1999/02/25 07:08:30  RD
+// wxPython version 2.0b5
+//
+// Revision 1.10  1998/12/17 17:52:19  RD
+//
+// wxPython 0.5.2
+// Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
+// versions are much closer now!
+//

 // Revision 1.9  1998/12/17 14:07:29  RR
 // Revision 1.9  1998/12/17 14:07:29  RR

+//

 //   Removed minor differences between wxMSW and wxGTK
 //
 // Revision 1.8  1998/12/15 20:41:15  RD
 //   Removed minor differences between wxMSW and wxGTK
 //
 // Revision 1.8  1998/12/15 20:41:15  RD