X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e70b4d2db930a297f0625b7d43109f793fd3338a..4976f9967a2dd37dc501e187d7b13a1e6ca22966:/wxPython/src/gtk/grid.py

diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py
index 03e3018e71..2c4c942c79 100644
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -111,6 +111,21 @@ class GridCellRenderer(GridCellWorker):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def Draw(*args, **kwargs):
+        """
+        Draw(self, Grid grid, GridCellAttr attr, DC dc, Rect rect, int row, 
+            int col, bool isSelected)
+        """
+        return _grid.GridCellRenderer_Draw(*args, **kwargs)
+
+    def GetBestSize(*args, **kwargs):
+        """GetBestSize(self, Grid grid, GridCellAttr attr, DC dc, int row, int col) -> Size"""
+        return _grid.GridCellRenderer_GetBestSize(*args, **kwargs)
+
+    def Clone(*args, **kwargs):
+        """Clone(self) -> GridCellRenderer"""
+        return _grid.GridCellRenderer_Clone(*args, **kwargs)
+
 _grid.GridCellRenderer_swigregister(GridCellRenderer)
 
 class PyGridCellRenderer(GridCellRenderer):
@@ -120,7 +135,7 @@ class PyGridCellRenderer(GridCellRenderer):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> PyGridCellRenderer"""
         _grid.PyGridCellRenderer_swiginit(self,_grid.new_PyGridCellRenderer(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)
+        self._setOORInfo(self);PyGridCellRenderer._setCallbackInfo(self, self, PyGridCellRenderer)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -307,9 +322,8 @@ class GridCellEditor(GridCellWorker):
 
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
-        val = _grid.GridCellEditor_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _grid.GridCellEditor_Destroy(*args, **kwargs)
 
     CellAttr = property(GetCellAttr,SetCellAttr,doc="See `GetCellAttr` and `SetCellAttr`") 
     Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") 
@@ -322,7 +336,7 @@ class PyGridCellEditor(GridCellEditor):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> PyGridCellEditor"""
         _grid.PyGridCellEditor_swiginit(self,_grid.new_PyGridCellEditor(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)
+        self._setOORInfo(self);PyGridCellEditor._setCallbackInfo(self, self, PyGridCellEditor)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -426,7 +440,26 @@ class GridCellBoolEditor(GridCellEditor):
         _grid.GridCellBoolEditor_swiginit(self,_grid.new_GridCellBoolEditor(*args, **kwargs))
         self._setOORInfo(self)
 
+    def UseStringValues(*args, **kwargs):
+        """UseStringValues(String valueTrue=OneString, String valueFalse=EmptyString)"""
+        return _grid.GridCellBoolEditor_UseStringValues(*args, **kwargs)
+
+    UseStringValues = staticmethod(UseStringValues)
+    def IsTrueValue(*args, **kwargs):
+        """IsTrueValue(String value) -> bool"""
+        return _grid.GridCellBoolEditor_IsTrueValue(*args, **kwargs)
+
+    IsTrueValue = staticmethod(IsTrueValue)
 _grid.GridCellBoolEditor_swigregister(GridCellBoolEditor)
+OneString = cvar.OneString
+
+def GridCellBoolEditor_UseStringValues(*args, **kwargs):
+  """GridCellBoolEditor_UseStringValues(String valueTrue=OneString, String valueFalse=EmptyString)"""
+  return _grid.GridCellBoolEditor_UseStringValues(*args, **kwargs)
+
+def GridCellBoolEditor_IsTrueValue(*args, **kwargs):
+  """GridCellBoolEditor_IsTrueValue(String value) -> bool"""
+  return _grid.GridCellBoolEditor_IsTrueValue(*args, **kwargs)
 
 class GridCellChoiceEditor(GridCellEditor):
     """Proxy of C++ GridCellChoiceEditor class"""
@@ -669,7 +702,7 @@ class PyGridCellAttrProvider(GridCellAttrProvider):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> PyGridCellAttrProvider"""
         _grid.PyGridCellAttrProvider_swiginit(self,_grid.new_PyGridCellAttrProvider(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridCellAttrProvider)
+        PyGridCellAttrProvider._setCallbackInfo(self, self, PyGridCellAttrProvider)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -873,7 +906,7 @@ class PyGridTableBase(GridTableBase):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> PyGridTableBase"""
         _grid.PyGridTableBase_swiginit(self,_grid.new_PyGridTableBase(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)
+        self._setOORInfo(self);PyGridTableBase._setCallbackInfo(self, self, PyGridTableBase)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -885,9 +918,8 @@ class PyGridTableBase(GridTableBase):
 
         Deletes the C++ object this Python object is a proxy for.
         """
-        val = _grid.PyGridTableBase_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _grid.PyGridTableBase_Destroy(*args, **kwargs)
 
     def base_GetTypeName(*args, **kw):
         return PyGridTableBase.GetTypeName(*args, **kw)
@@ -1105,7 +1137,7 @@ class GridCellCoords(object):
     def __str__(self):                   return str(self.Get())
     def __repr__(self):                  return 'wxGridCellCoords'+str(self.Get())
     def __len__(self):                   return len(self.Get())
-    def __getitem__(self, index):        return self.asTuple()[index]
+    def __getitem__(self, index):        return self.Get()[index]
     def __setitem__(self, index, val):
         if index == 0: self.SetRow(val)
         elif index == 1: self.SetCol(val)