fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / wxPython / src / gtk / controls.py

diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py
index 974248219c63415864eb0e72d64f78282d1b8417..0aa5821a261a2ea10735e2cbfa1a58eb2cec2cbd 100644 (file)
--- a/wxPython/src/gtk/controls.py
+++ b/wxPython/src/gtk/controls.py
@@ -142,6 +142,9 @@ class wxChoicePtr(wxControlPtr):
     def Clear(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_Clear,(self,) + _args, _kwargs)
         return val
+    def Delete(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_Delete,(self,) + _args, _kwargs)
+        return val
     def FindString(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_FindString,(self,) + _args, _kwargs)
         return val
@@ -157,8 +160,8 @@ class wxChoicePtr(wxControlPtr):
     def GetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_GetStringSelection,(self,) + _args, _kwargs)
         return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxChoice_Number,(self,) + _args, _kwargs)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_GetCount,(self,) + _args, _kwargs)
         return val
     def SetColumns(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetColumns,(self,) + _args, _kwargs)
@@ -169,8 +172,15 @@ class wxChoicePtr(wxControlPtr):
     def SetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxChoice_SetStringSelection,(self,) + _args, _kwargs)
         return val
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxChoice_SetString,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxChoice instance at %s>" % (self.this,)
+    
+    Number = GetCount
+    Select = SetSelection
+    
 class wxChoice(wxChoicePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxChoice,_args,_kwargs)
@@ -220,9 +230,6 @@ class wxComboBoxPtr(wxChoicePtr):
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_GetValue,(self,) + _args, _kwargs)
         return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxComboBox_Number,(self,) + _args, _kwargs)
-        return val
     def Paste(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_Paste,(self,) + _args, _kwargs)
         return val
@@ -247,6 +254,9 @@ class wxComboBoxPtr(wxChoicePtr):
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxComboBox_SetValue,(self,) + _args, _kwargs)
         return val
+    def SetEditable(self, *_args, **_kwargs):
+        val = apply(controlsc.wxComboBox_SetEditable,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxComboBox instance at %s>" % (self.this,)
 class wxComboBox(wxComboBoxPtr):
@@ -380,8 +390,11 @@ class wxListBoxPtr(wxControlPtr):
     def GetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_GetStringSelection,(self,) + _args, _kwargs)
         return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxListBox_Number,(self,) + _args, _kwargs)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_GetCount,(self,) + _args, _kwargs)
+        return val
+    def IsSelected(self, *_args, **_kwargs):
+        val = apply(controlsc.wxListBox_IsSelected,(self,) + _args, _kwargs)
         return val
     def Selected(self, *_args, **_kwargs):
         val = apply(controlsc.wxListBox_Selected,(self,) + _args, _kwargs)
@@ -406,6 +419,7 @@ class wxListBoxPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxListBox instance at %s>" % (self.this,)
+    Number = GetCount
 class wxListBox(wxListBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxListBox,_args,_kwargs)
@@ -442,6 +456,53 @@ class wxCheckListBox(wxCheckListBoxPtr):
 
 
 
+class wxTextAttrPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,controlsc=controlsc):
+        if self.thisown == 1 :
+            controlsc.delete_wxTextAttr(self)
+    def SetTextColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
+        return val
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_SetBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def SetFont(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_SetFont,(self,) + _args, _kwargs)
+        return val
+    def HasTextColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_HasTextColour,(self,) + _args, _kwargs)
+        return val
+    def HasBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_HasBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def HasFont(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_HasFont,(self,) + _args, _kwargs)
+        return val
+    def GetTextColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_GetTextColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def GetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_GetBackgroundColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def GetFont(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextAttr_GetFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxTextAttr instance at %s>" % (self.this,)
+class wxTextAttr(wxTextAttrPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxTextAttr,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 class wxTextCtrlPtr(wxControlPtr):
     def __init__(self,this):
         self.this = this
@@ -551,6 +612,16 @@ class wxTextCtrlPtr(wxControlPtr):
     def Redo(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_Redo,(self,) + _args, _kwargs)
         return val
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
+        return val
+    def SetDefaultStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_SetDefaultStyle,(self,) + _args, _kwargs)
+        return val
+    def GetDefaultStyle(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_GetDefaultStyle,(self,) + _args, _kwargs)
+        if val: val = wxTextAttrPtr(val) 
+        return val
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val
@@ -668,23 +739,23 @@ class wxRadioBoxPtr(wxControlPtr):
     def FindString(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_FindString,(self,) + _args, _kwargs)
         return val
+    def GetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
+        return val
     def GetItemLabel(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetItemLabel,(self,) + _args, _kwargs)
         return val
+    def SetItemLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)
+        return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
         return val
-    def GetString(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_GetString,(self,) + _args, _kwargs)
-        return val
     def GetStringSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetStringSelection,(self,) + _args, _kwargs)
         return val
-    def Number(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_Number,(self,) + _args, _kwargs)
-        return val
-    def SetItemLabel(self, *_args, **_kwargs):
-        val = apply(controlsc.wxRadioBox_SetItemLabel,(self,) + _args, _kwargs)
+    def GetCount(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_GetCount,(self,) + _args, _kwargs)
         return val
     def SetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_SetSelection,(self,) + _args, _kwargs)
@@ -700,6 +771,7 @@ class wxRadioBoxPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxRadioBox instance at %s>" % (self.this,)
+    Number = GetCount
 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(controlsc.new_wxRadioBox,_args,_kwargs)
@@ -831,6 +903,29 @@ class wxSpinCtrl(wxSpinCtrlPtr):
 
 
 
+class wxToggleButtonPtr(wxControlPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_SetValue,(self,) + _args, _kwargs)
+        return val
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_GetValue,(self,) + _args, _kwargs)
+        return val
+    def SetLabel(self, *_args, **_kwargs):
+        val = apply(controlsc.wxToggleButton_SetLabel,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxToggleButton instance at %s>" % (self.this,)
+class wxToggleButton(wxToggleButtonPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(controlsc.new_wxToggleButton,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -846,3 +941,4 @@ def wxButton_GetDefaultSize(*_args, **_kwargs):
 
 cvar = controlsc.cvar
 wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator)
+wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = controlsc.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED