X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4069916857010a2f9a73b4e14380d6c8d416aefd..3856ee0ba4f6b9d1df66bc1b3367af9e1328a860:/wxPython/src/mac/grid.py

diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py
index cfbddc55b4..1d15cdc4e6 100644
--- a/wxPython/src/mac/grid.py
+++ b/wxPython/src/mac/grid.py
@@ -69,6 +69,9 @@ class wxGridCellRendererPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellRenderer__setOORInfo,(self,) + _args, _kwargs)
+        return val
     def SetParameters(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellRenderer_SetParameters,(self,) + _args, _kwargs)
         return val
@@ -87,7 +90,6 @@ class wxGridCellRendererPtr :
         return val
     def Clone(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellRenderer_Clone,(self,) + _args, _kwargs)
-        if val: val = wxGridCellRendererPtr(val) 
         return val
     def __repr__(self):
         return "<C wxGridCellRenderer instance at %s>" % (self.this,)
@@ -115,6 +117,7 @@ class wxPyGridCellRenderer(wxPyGridCellRendererPtr):
         self.this = apply(gridc.new_wxPyGridCellRenderer,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyGridCellRenderer)
+        self._setOORInfo(self)
 
 
 
@@ -129,6 +132,7 @@ class wxGridCellStringRenderer(wxGridCellStringRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellStringRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -143,6 +147,7 @@ class wxGridCellNumberRenderer(wxGridCellNumberRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellNumberRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -169,6 +174,7 @@ class wxGridCellFloatRenderer(wxGridCellFloatRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellFloatRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -183,6 +189,7 @@ class wxGridCellBoolRenderer(wxGridCellBoolRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellBoolRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -197,6 +204,7 @@ class wxGridCellDateTimeRenderer(wxGridCellDateTimeRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellDateTimeRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -211,6 +219,7 @@ class wxGridCellEnumRenderer(wxGridCellEnumRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellEnumRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -225,6 +234,7 @@ class wxGridCellAutoWrapStringRenderer(wxGridCellAutoWrapStringRendererPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellAutoWrapStringRenderer,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -233,6 +243,9 @@ class wxGridCellEditorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellEditor__setOORInfo,(self,) + _args, _kwargs)
+        return val
     def IsCreated(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_IsCreated,(self,) + _args, _kwargs)
         return val
@@ -242,6 +255,12 @@ class wxGridCellEditorPtr :
     def SetControl(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_SetControl,(self,) + _args, _kwargs)
         return val
+    def GetCellAttr(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellEditor_GetCellAttr,(self,) + _args, _kwargs)
+        return val
+    def SetCellAttr(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellEditor_SetCellAttr,(self,) + _args, _kwargs)
+        return val
     def SetParameters(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_SetParameters,(self,) + _args, _kwargs)
         return val
@@ -265,7 +284,6 @@ class wxGridCellEditorPtr :
         return val
     def Clone(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_Clone,(self,) + _args, _kwargs)
-        if val: val = wxGridCellEditorPtr(val) 
         return val
     def SetSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_SetSize,(self,) + _args, _kwargs)
@@ -291,6 +309,9 @@ class wxGridCellEditorPtr :
     def Destroy(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_Destroy,(self,) + _args, _kwargs)
         return val
+    def GetValue(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellEditor_GetValue,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxGridCellEditor instance at %s>" % (self.this,)
 class wxGridCellEditor(wxGridCellEditorPtr):
@@ -334,6 +355,9 @@ class wxPyGridCellEditorPtr(wxGridCellEditorPtr):
     def base_SetParameters(self, *_args, **_kwargs):
         val = apply(gridc.wxPyGridCellEditor_base_SetParameters,(self,) + _args, _kwargs)
         return val
+    def base_GetValue(self, *_args, **_kwargs):
+        val = apply(gridc.wxPyGridCellEditor_base_GetValue,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxPyGridCellEditor instance at %s>" % (self.this,)
 class wxPyGridCellEditor(wxPyGridCellEditorPtr):
@@ -341,6 +365,7 @@ class wxPyGridCellEditor(wxPyGridCellEditorPtr):
         self.this = apply(gridc.new_wxPyGridCellEditor,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyGridCellEditor)
+        self._setOORInfo(self)
 
 
 
@@ -355,6 +380,7 @@ class wxGridCellTextEditor(wxGridCellTextEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellTextEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -369,6 +395,7 @@ class wxGridCellNumberEditor(wxGridCellNumberEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellNumberEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -383,6 +410,7 @@ class wxGridCellFloatEditor(wxGridCellFloatEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellFloatEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -397,6 +425,7 @@ class wxGridCellBoolEditor(wxGridCellBoolEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellBoolEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -411,6 +440,7 @@ class wxGridCellChoiceEditor(wxGridCellChoiceEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellChoiceEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -425,6 +455,7 @@ class wxGridCellEnumEditor(wxGridCellEnumEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellEnumEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -439,6 +470,7 @@ class wxGridCellAutoWrapStringEditor(wxGridCellAutoWrapStringEditorPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellAutoWrapStringEditor,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -453,9 +485,11 @@ class wxGridCellAttrPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr__setOORInfo,(self,) + _args, _kwargs)
+        return val
     def Clone(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_Clone,(self,) + _args, _kwargs)
-        if val: val = wxGridCellAttrPtr(val) 
         return val
     def MergeWith(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_MergeWith,(self,) + _args, _kwargs)
@@ -478,6 +512,12 @@ class wxGridCellAttrPtr :
     def SetAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_SetAlignment,(self,) + _args, _kwargs)
         return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_SetOverflow,(self,) + _args, _kwargs)
+        return val
     def SetReadOnly(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_SetReadOnly,(self,) + _args, _kwargs)
         return val
@@ -526,13 +566,17 @@ class wxGridCellAttrPtr :
     def GetAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_GetAlignment,(self,) + _args, _kwargs)
         return val
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_GetSize,(self,) + _args, _kwargs)
+        return val
+    def GetOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_GetOverflow,(self,) + _args, _kwargs)
+        return val
     def GetRenderer(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_GetRenderer,(self,) + _args, _kwargs)
-        if val: val = wxGridCellRendererPtr(val) 
         return val
     def GetEditor(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_GetEditor,(self,) + _args, _kwargs)
-        if val: val = wxGridCellEditorPtr(val) 
         return val
     def IsReadOnly(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_IsReadOnly,(self,) + _args, _kwargs)
@@ -546,6 +590,7 @@ class wxGridCellAttr(wxGridCellAttrPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellAttr,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -554,9 +599,11 @@ class wxGridCellAttrProviderPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttrProvider__setOORInfo,(self,) + _args, _kwargs)
+        return val
     def GetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttrProvider_GetAttr,(self,) + _args, _kwargs)
-        if val: val = wxGridCellAttrPtr(val) 
         return val
     def SetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttrProvider_SetAttr,(self,) + _args, _kwargs)
@@ -579,6 +626,7 @@ class wxGridCellAttrProvider(wxGridCellAttrProviderPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellAttrProvider,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -592,7 +640,6 @@ class wxPyGridCellAttrProviderPtr(wxGridCellAttrProviderPtr):
         return val
     def base_GetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxPyGridCellAttrProvider_base_GetAttr,(self,) + _args, _kwargs)
-        if val: val = wxGridCellAttrPtr(val) 
         return val
     def base_SetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxPyGridCellAttrProvider_base_SetAttr,(self,) + _args, _kwargs)
@@ -618,12 +665,14 @@ class wxGridTableBasePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def _setOORInfo(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridTableBase__setOORInfo,(self,) + _args, _kwargs)
+        return val
     def SetAttrProvider(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_SetAttrProvider,(self,) + _args, _kwargs)
         return val
     def GetAttrProvider(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_GetAttrProvider,(self,) + _args, _kwargs)
-        if val: val = wxGridCellAttrProviderPtr(val) 
         return val
     def SetView(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_SetView,(self,) + _args, _kwargs)
@@ -711,7 +760,6 @@ class wxGridTableBasePtr(wxObjectPtr):
         return val
     def GetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_GetAttr,(self,) + _args, _kwargs)
-        if val: val = wxGridCellAttrPtr(val) 
         return val
     def SetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_SetAttr,(self,) + _args, _kwargs)
@@ -788,7 +836,6 @@ class wxPyGridTableBasePtr(wxGridTableBasePtr):
         return val
     def base_GetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxPyGridTableBase_base_GetAttr,(self,) + _args, _kwargs)
-        if val: val = wxGridCellAttrPtr(val) 
         return val
     def base_SetAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxPyGridTableBase_base_SetAttr,(self,) + _args, _kwargs)
@@ -806,6 +853,7 @@ class wxPyGridTableBase(wxPyGridTableBasePtr):
         self.this = apply(gridc.new_wxPyGridTableBase,_args,_kwargs)
         self.thisown = 1
         self._setCallbackInfo(self, wxPyGridTableBase)
+        self._setOORInfo(self)
 
 
 
@@ -820,6 +868,7 @@ class wxGridStringTable(wxGridStringTablePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridStringTable,_args,_kwargs)
         self.thisown = 1
+        self._setOORInfo(self)
 
 
 
@@ -828,9 +877,12 @@ class wxGridTableMessagePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,gridc=gridc):
-        if self.thisown == 1 :
-            gridc.delete_wxGridTableMessage(self)
+    def __del__(self, delfunc=gridc.delete_wxGridTableMessage):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def SetTableObject(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableMessage_SetTableObject,(self,) + _args, _kwargs)
         return val
@@ -869,9 +921,12 @@ class wxGridCellCoordsPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,gridc=gridc):
-        if self.thisown == 1 :
-            gridc.delete_wxGridCellCoords(self)
+    def __del__(self, delfunc=gridc.delete_wxGridCellCoords):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetRow(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellCoords_GetRow,(self,) + _args, _kwargs)
         return val
@@ -895,8 +950,16 @@ class wxGridCellCoordsPtr :
         return val
     def __repr__(self):
         return "<C wxGridCellCoords instance at %s>" % (self.this,)
-    def __str__(self): return str(self.asTuple())
-    def __repr__(self): return str(self.asTuple())
+    
+    def __str__(self):                   return str(self.asTuple())
+    def __repr__(self):                  return 'wxGridCellCoords'+str(self.asTuple())
+    def __len__(self):                   return len(self.asTuple())
+    def __getitem__(self, index):        return self.asTuple()[index]
+    def __setitem__(self, index, val):
+        if index == 0: self.SetRow(val)
+        elif index == 1: self.SetCol(val)
+        else: raise IndexError
+    
 class wxGridCellCoords(wxGridCellCoordsPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(gridc.new_wxGridCellCoords,_args,_kwargs)
@@ -918,6 +981,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetSelectionMode(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetSelectionMode,(self,) + _args, _kwargs)
         return val
+    def GetSelectionMode(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetSelectionMode,(self,) + _args, _kwargs)
+        return val
     def GetNumberRows(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetNumberRows,(self,) + _args, _kwargs)
         return val
@@ -975,6 +1041,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def ForceRefresh(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_ForceRefresh,(self,) + _args, _kwargs)
         return val
+    def Refresh(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_Refresh,(self,) + _args, _kwargs)
+        return val
     def IsEditable(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_IsEditable,(self,) + _args, _kwargs)
         return val
@@ -1103,6 +1172,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def GetColLabelAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetColLabelAlignment,(self,) + _args, _kwargs)
         return val
+    def GetColLabelTextOrientation(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetColLabelTextOrientation,(self,) + _args, _kwargs)
+        return val
     def GetRowLabelValue(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetRowLabelValue,(self,) + _args, _kwargs)
         return val
@@ -1144,6 +1216,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetColLabelAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetColLabelAlignment,(self,) + _args, _kwargs)
         return val
+    def SetColLabelTextOrientation(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetColLabelTextOrientation,(self,) + _args, _kwargs)
+        return val
     def SetRowLabelValue(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetRowLabelValue,(self,) + _args, _kwargs)
         return val
@@ -1189,6 +1264,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def CanDragGridSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_CanDragGridSize,(self,) + _args, _kwargs)
         return val
+    def SetAttr(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetAttr,(self,) + _args, _kwargs)
+        return val
     def SetRowAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetRowAttr,(self,) + _args, _kwargs)
         return val
@@ -1255,6 +1333,15 @@ class wxGridPtr(wxScrolledWindowPtr):
     def GetCellAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetCellAlignment,(self,) + _args, _kwargs)
         return val
+    def GetDefaultCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetDefaultCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def GetCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def GetCellSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellSize,(self,) + _args, _kwargs)
+        return val
     def SetDefaultRowSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetDefaultRowSize,(self,) + _args, _kwargs)
         return val
@@ -1282,6 +1369,12 @@ class wxGridPtr(wxScrolledWindowPtr):
     def AutoSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_AutoSize,(self,) + _args, _kwargs)
         return val
+    def AutoSizeRowLabelSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_AutoSizeRowLabelSize,(self,) + _args, _kwargs)
+        return val
+    def AutoSizeColLabelSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_AutoSizeColLabelSize,(self,) + _args, _kwargs)
+        return val
     def SetColMinimalWidth(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetColMinimalWidth,(self,) + _args, _kwargs)
         return val
@@ -1312,6 +1405,15 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetCellAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetCellAlignment,(self,) + _args, _kwargs)
         return val
+    def SetDefaultCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetDefaultCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def SetCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def SetCellSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellSize,(self,) + _args, _kwargs)
+        return val
     def SetDefaultRenderer(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetDefaultRenderer,(self,) + _args, _kwargs)
         return val
@@ -1320,11 +1422,9 @@ class wxGridPtr(wxScrolledWindowPtr):
         return val
     def GetDefaultRenderer(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetDefaultRenderer,(self,) + _args, _kwargs)
-        if val: val = wxGridCellRendererPtr(val) 
         return val
     def GetCellRenderer(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetCellRenderer,(self,) + _args, _kwargs)
-        if val: val = wxGridCellRendererPtr(val) 
         return val
     def SetDefaultEditor(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetDefaultEditor,(self,) + _args, _kwargs)
@@ -1334,11 +1434,9 @@ class wxGridPtr(wxScrolledWindowPtr):
         return val
     def GetDefaultEditor(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetDefaultEditor,(self,) + _args, _kwargs)
-        if val: val = wxGridCellEditorPtr(val) 
         return val
     def GetCellEditor(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetCellEditor,(self,) + _args, _kwargs)
-        if val: val = wxGridCellEditorPtr(val) 
         return val
     def GetCellValue(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetCellValue,(self,) + _args, _kwargs)
@@ -1373,6 +1471,30 @@ class wxGridPtr(wxScrolledWindowPtr):
     def IsInSelection(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_IsInSelection,(self,) + _args, _kwargs)
         return val
+    def GetSelectedCells(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetSelectedCells,(self,) + _args, _kwargs)
+        return val
+    def GetSelectionBlockTopLeft(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetSelectionBlockTopLeft,(self,) + _args, _kwargs)
+        return val
+    def GetSelectionBlockBottomRight(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetSelectionBlockBottomRight,(self,) + _args, _kwargs)
+        return val
+    def GetSelectedRows(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetSelectedRows,(self,) + _args, _kwargs)
+        return val
+    def GetSelectedCols(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetSelectedCols,(self,) + _args, _kwargs)
+        return val
+    def DeselectRow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_DeselectRow,(self,) + _args, _kwargs)
+        return val
+    def DeselectCol(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_DeselectCol,(self,) + _args, _kwargs)
+        return val
+    def DeselectCell(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_DeselectCell,(self,) + _args, _kwargs)
+        return val
     def BlockToDeviceRect(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_BlockToDeviceRect,(self,) + _args, _kwargs)
         if val: val = wxRectPtr(val) ; val.thisown = 1
@@ -1396,19 +1518,15 @@ class wxGridPtr(wxScrolledWindowPtr):
         return val
     def GetDefaultEditorForCell(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetDefaultEditorForCell,(self,) + _args, _kwargs)
-        if val: val = wxGridCellEditorPtr(val) 
         return val
     def GetDefaultRendererForCell(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetDefaultRendererForCell,(self,) + _args, _kwargs)
-        if val: val = wxGridCellRendererPtr(val) 
         return val
     def GetDefaultEditorForType(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetDefaultEditorForType,(self,) + _args, _kwargs)
-        if val: val = wxGridCellEditorPtr(val) 
         return val
     def GetDefaultRendererForType(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetDefaultRendererForType,(self,) + _args, _kwargs)
-        if val: val = wxGridCellRendererPtr(val) 
         return val
     def SetMargins(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetMargins,(self,) + _args, _kwargs)
@@ -1604,6 +1722,8 @@ wxGRID_VALUE_FLOAT = gridc.wxGRID_VALUE_FLOAT
 wxGRID_VALUE_CHOICE = gridc.wxGRID_VALUE_CHOICE
 wxGRID_VALUE_TEXT = gridc.wxGRID_VALUE_TEXT
 wxGRID_VALUE_LONG = gridc.wxGRID_VALUE_LONG
+wxGRID_VALUE_CHOICEINT = gridc.wxGRID_VALUE_CHOICEINT
+wxGRID_VALUE_DATETIME = gridc.wxGRID_VALUE_DATETIME
 cvar = gridc.cvar
 wxGridNoCellCoords = wxGridCellCoordsPtr(gridc.cvar.wxGridNoCellCoords)
 wxGridNoCellRect = wxRectPtr(gridc.cvar.wxGridNoCellRect)