removed leftover testing code in patch for wxComboBox and wxListBox that

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

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index 0477c9532f3387434e22b20e0e78d006159b0746..a30e1d7244c26d04260e133bdb15b8461494fe03 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -158,15 +158,23 @@ public:
 
     void Append(const wxString& item);
     void Clear();
+    void Delete(int n);
     int FindString(const wxString& string);
     int GetColumns();
     int GetSelection();
     wxString GetString(const int n);
     wxString GetStringSelection();
-    int Number();
+    int GetCount();
     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 = "
+    Number = GetCount
+    Select = SetSelection
+    "
+
 };
 
 //----------------------------------------------------------------------
@@ -198,7 +206,6 @@ public:
     wxString GetString(int n);
     wxString GetStringSelection();
     wxString GetValue();
-    int Number();
     void Paste();
     void Replace(long from, long to, const wxString& text);
     void Remove(long from, long to);
@@ -208,6 +215,7 @@ public:
     void SetSelection(int n);
     %name(SetMark)void SetSelection(long from, long to);
     void SetValue(const wxString& text);
+    void SetEditable(bool editable);
 };
 
 //----------------------------------------------------------------------
@@ -314,7 +322,9 @@ public:
 
     wxString GetString(int n);
     wxString GetStringSelection();
-    int Number();
+    int GetCount();
+    %pragma(python) addtoclass = "Number = GetCount"
+    bool IsSelected(const int n);
     bool Selected(const int n);
     void Set(int LCOUNT, wxString* choices);
     // TODO:    void SetClientData(const int n, char* data);
@@ -515,15 +525,26 @@ public:
     %name(EnableItem)void Enable(int n, bool enable);
     int FindString(const wxString& string);
 
-//***    wxString GetLabel();
-//***    void SetLabel(const wxString& label);
+    wxString GetString(int n);
+
+#ifdef __WXMSW__
+    void SetString(int n, const wxString& label);
+    %pragma(python) addtoclass = "
+    GetItemLabel = GetString
+    SetItemLabel = SetString
+    "
+    int GetColumnCount();
+    int GetRowCount();
+#else
+    %name(GetItemLabel)wxString GetLabel( int item );
+    %name(SetItemLabel)void SetLabel( int item, const wxString& label );
+#endif
 
-    %name(GetItemLabel)wxString GetLabel(int n);
     int GetSelection();
-    wxString GetString(int n);
     wxString GetStringSelection();
-    int Number();
-    %name(SetItemLabel)void SetLabel(int n, const wxString& label);
+    int GetCount();
+    %pragma(python) addtoclass = "Number = GetCount"
+
     void SetSelection(int n);
     void SetStringSelection(const wxString& string);
     void Show(bool show);