no changes

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

diff --git a/wxPython/src/gtk/controls.py b/wxPython/src/gtk/controls.py
index 3cff310f329adce3987550004fd2e4455dcc381c..d1b3ccc1bc33c9c9128c3bacf0c0d44f5072673b 100644 (file)
--- a/wxPython/src/gtk/controls.py
+++ b/wxPython/src/gtk/controls.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from events import *
 from clip_dnd import *
 
 from events import *


@@ -198,6 +200,9 @@ class wxCheckBoxPtr(wxControlPtr):
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
         return val
     def GetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_GetValue,(self,) + _args, _kwargs)
         return val

+    def IsChecked(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckBox_IsChecked,(self,) + _args, _kwargs)
+        return val

     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs)
         return val
     def SetValue(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckBox_SetValue,(self,) + _args, _kwargs)
         return val


@@ -566,6 +571,12 @@ class wxCheckListBoxPtr(wxListBoxPtr):
     def GetItemHeight(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs)
         return val
     def GetItemHeight(self, *_args, **_kwargs):
         val = apply(controlsc.wxCheckListBox_GetItemHeight,(self,) + _args, _kwargs)
         return val

+    def HitTest(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_HitTest,(self,) + _args, _kwargs)
+        return val
+    def HitTestXY(self, *_args, **_kwargs):
+        val = apply(controlsc.wxCheckListBox_HitTestXY,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxCheckListBox instance at %s>" % (self.this,)
 class wxCheckListBox(wxCheckListBoxPtr):
     def __repr__(self):
         return "<C wxCheckListBox instance at %s>" % (self.this,)
 class wxCheckListBox(wxCheckListBoxPtr):


@@ -587,9 +598,12 @@ class wxTextAttrPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,controlsc=controlsc):
-        if self.thisown == 1 :
-            controlsc.delete_wxTextAttr(self)
+    def __del__(self, delfunc=controlsc.delete_wxTextAttr):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def SetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
         return val
     def SetTextColour(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextAttr_SetTextColour,(self,) + _args, _kwargs)
         return val


@@ -697,6 +711,9 @@ class wxTextCtrlPtr(wxControlPtr):
     def AppendText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
         return val
     def AppendText(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_AppendText,(self,) + _args, _kwargs)
         return val

+    def EmulateKeyPress(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_EmulateKeyPress,(self,) + _args, _kwargs)
+        return val

     def SetStyle(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
         return val
     def SetStyle(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetStyle,(self,) + _args, _kwargs)
         return val


@@ -767,6 +784,12 @@ class wxTextCtrlPtr(wxControlPtr):
     def SetEditable(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
         return val
     def SetEditable(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_SetEditable,(self,) + _args, _kwargs)
         return val

+    def IsSingleLine(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsSingleLine,(self,) + _args, _kwargs)
+        return val
+    def IsMultiLine(self, *_args, **_kwargs):
+        val = apply(controlsc.wxTextCtrl_IsMultiLine,(self,) + _args, _kwargs)
+        return val

     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val
     def write(self, *_args, **_kwargs):
         val = apply(controlsc.wxTextCtrl_write,(self,) + _args, _kwargs)
         return val


@@ -930,11 +953,8 @@ class wxRadioBoxPtr(wxControlPtr):
     def GetString(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetString,(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)
+    def SetString(self, *_args, **_kwargs):
+        val = apply(controlsc.wxRadioBox_SetString,(self,) + _args, _kwargs)

         return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)
         return val
     def GetSelection(self, *_args, **_kwargs):
         val = apply(controlsc.wxRadioBox_GetSelection,(self,) + _args, _kwargs)


@@ -959,6 +979,10 @@ class wxRadioBoxPtr(wxControlPtr):
         return val
     def __repr__(self):
         return "<C wxRadioBox instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxRadioBox instance at %s>" % (self.this,)

+    
+    GetItemLabel = GetString
+    SetItemLabel = SetString
+    

     Number = GetCount
 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):
     Number = GetCount
 class wxRadioBox(wxRadioBoxPtr):
     def __init__(self,*_args,**_kwargs):