* wxStream fixes (integer/line parsing).

[wxWidgets.git] / utils / wxPython / src / msw / controls.py

diff --git a/utils/wxPython/src/msw/controls.py b/utils/wxPython/src/msw/controls.py
index af330a52172f3653d20adb1cd1ebb18773fe7746..8afe9f145aa7cbf26ab1b3bfcb631d0ca47a05a4 100644 (file)
--- a/utils/wxPython/src/msw/controls.py
+++ b/utils/wxPython/src/msw/controls.py
@@ -185,7 +185,7 @@ class wxChoice(wxChoicePtr):
 
 
 
-class wxComboBoxPtr(wxControlPtr):
+class wxComboBoxPtr(wxChoicePtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -243,9 +243,6 @@ class wxComboBoxPtr(wxControlPtr):
     def SetInsertionPointEnd(self):
         val = controlsc.wxComboBox_SetInsertionPointEnd(self.this)
         return val
-    def SetSelection(self,arg0,*args):
-        val = apply(controlsc.wxComboBox_SetSelection,(self.this,arg0,)+args)
-        return val
     def SetMark(self,arg0,arg1):
         val = controlsc.wxComboBox_SetMark(self.this,arg0,arg1)
         return val
@@ -383,6 +380,9 @@ class wxListBoxPtr(wxControlPtr):
     def GetSelection(self):
         val = controlsc.wxListBox_GetSelection(self.this)
         return val
+    def GetSelections(self):
+        val = controlsc.wxListBox_GetSelections(self.this)
+        return val
     def GetString(self,arg0):
         val = controlsc.wxListBox_GetString(self.this,arg0)
         return val
@@ -536,9 +536,33 @@ class wxTextCtrlPtr(wxControlPtr):
     def WriteText(self,arg0):
         val = controlsc.wxTextCtrl_WriteText(self.this,arg0)
         return val
+    def AppendText(self,arg0):
+        val = controlsc.wxTextCtrl_AppendText(self.this,arg0)
+        return val
     def XYToPosition(self,arg0,arg1):
         val = controlsc.wxTextCtrl_XYToPosition(self.this,arg0,arg1)
         return val
+    def CanCopy(self):
+        val = controlsc.wxTextCtrl_CanCopy(self.this)
+        return val
+    def CanCut(self):
+        val = controlsc.wxTextCtrl_CanCut(self.this)
+        return val
+    def CanPaste(self):
+        val = controlsc.wxTextCtrl_CanPaste(self.this)
+        return val
+    def CanRedo(self):
+        val = controlsc.wxTextCtrl_CanRedo(self.this)
+        return val
+    def CanUndo(self):
+        val = controlsc.wxTextCtrl_CanUndo(self.this)
+        return val
+    def GetSelection(self):
+        val = controlsc.wxTextCtrl_GetSelection(self.this)
+        return val
+    def IsEditable(self):
+        val = controlsc.wxTextCtrl_IsEditable(self.this)
+        return val
     def __repr__(self):
         return "<C wxTextCtrl instance>"
 class wxTextCtrl(wxTextCtrlPtr):
@@ -662,20 +686,17 @@ class wxRadioBoxPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def EnableBox(self,arg0):
-        val = controlsc.wxRadioBox_EnableBox(self.this,arg0)
+    def Enable(self,arg0):
+        val = controlsc.wxRadioBox_Enable(self.this,arg0)
         return val
-    def Enable(self,arg0,arg1):
-        val = controlsc.wxRadioBox_Enable(self.this,arg0,arg1)
+    def EnableItem(self,arg0,arg1):
+        val = controlsc.wxRadioBox_EnableItem(self.this,arg0,arg1)
         return val
     def FindString(self,arg0):
         val = controlsc.wxRadioBox_FindString(self.this,arg0)
         return val
-    def GetBoxLabel(self):
-        val = controlsc.wxRadioBox_GetBoxLabel(self.this)
-        return val
-    def GetLabel(self,arg0):
-        val = controlsc.wxRadioBox_GetLabel(self.this,arg0)
+    def GetItemLabel(self,arg0):
+        val = controlsc.wxRadioBox_GetItemLabel(self.this,arg0)
         return val
     def GetSelection(self):
         val = controlsc.wxRadioBox_GetSelection(self.this)
@@ -689,11 +710,8 @@ class wxRadioBoxPtr(wxControlPtr):
     def Number(self):
         val = controlsc.wxRadioBox_Number(self.this)
         return val
-    def SetBoxLabel(self,arg0):
-        val = controlsc.wxRadioBox_SetBoxLabel(self.this,arg0)
-        return val
-    def SetLabel(self,arg0,arg1):
-        val = controlsc.wxRadioBox_SetLabel(self.this,arg0,arg1)
+    def SetItemLabel(self,arg0,arg1):
+        val = controlsc.wxRadioBox_SetItemLabel(self.this,arg0,arg1)
         return val
     def SetSelection(self,arg0):
         val = controlsc.wxRadioBox_SetSelection(self.this,arg0)