correction for Mac OS compilation

[wxWidgets.git] / wxPython / src / msw / grid.py

diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py
index 2ae95724da3f99297b9dc52b2c81052d80fde047..04c9de468f2d8babacd1c57273259407e1930cc9 100644 (file)
--- a/wxPython/src/msw/grid.py
+++ b/wxPython/src/msw/grid.py
@@ -59,6 +59,9 @@ def EVT_GRID_EDITOR_SHOWN(win, fn):
 def EVT_GRID_EDITOR_HIDDEN(win, fn):
     win.Connect(-1, -1, wxEVT_GRID_EDITOR_HIDDEN, fn)
 
+def EVT_GRID_EDITOR_CREATED(win, fn):
+    win.Connect(-1, -1, wxEVT_GRID_EDITOR_CREATED, fn)
+
 
 class wxGridCellRendererPtr :
     def __init__(self,this):
@@ -191,7 +194,6 @@ class wxGridCellEditorPtr :
         return val
     def GetControl(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_GetControl,(self,) + _args, _kwargs)
-        if val: val = wxControlPtr(val) 
         return val
     def SetControl(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellEditor_SetControl,(self,) + _args, _kwargs)
@@ -370,6 +372,12 @@ class wxGridCellChoiceEditor(wxGridCellChoiceEditorPtr):
 
 
 class wxGridCellAttrPtr :
+    Any = gridc.wxGridCellAttr_Any
+    Default = gridc.wxGridCellAttr_Default
+    Cell = gridc.wxGridCellAttr_Cell
+    Row = gridc.wxGridCellAttr_Row
+    Col = gridc.wxGridCellAttr_Col
+    Merged = gridc.wxGridCellAttr_Merged
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -377,6 +385,9 @@ class wxGridCellAttrPtr :
         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)
+        return val
     def IncRef(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_IncRef,(self,) + _args, _kwargs)
         return val
@@ -404,6 +415,9 @@ class wxGridCellAttrPtr :
     def SetEditor(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_SetEditor,(self,) + _args, _kwargs)
         return val
+    def SetKind(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_SetKind,(self,) + _args, _kwargs)
+        return val
     def HasTextColour(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_HasTextColour,(self,) + _args, _kwargs)
         return val
@@ -422,6 +436,9 @@ class wxGridCellAttrPtr :
     def HasEditor(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_HasEditor,(self,) + _args, _kwargs)
         return val
+    def HasReadWriteMode(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_HasReadWriteMode,(self,) + _args, _kwargs)
+        return val
     def GetTextColour(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_GetTextColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) 
@@ -525,7 +542,7 @@ class wxPyGridCellAttrProvider(wxPyGridCellAttrProviderPtr):
 
 
 
-class wxGridTableBasePtr :
+class wxGridTableBasePtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
@@ -541,7 +558,6 @@ class wxGridTableBasePtr :
         return val
     def GetView(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_GetView,(self,) + _args, _kwargs)
-        if val: val = wxGridPtr(val) 
         return val
     def GetNumberRows(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableBase_GetNumberRows,(self,) + _args, _kwargs)
@@ -748,7 +764,6 @@ class wxGridTableMessagePtr :
         return val
     def GetTableObject(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableMessage_GetTableObject,(self,) + _args, _kwargs)
-        if val: val = wxGridTableBasePtr(val) 
         return val
     def SetId(self, *_args, **_kwargs):
         val = apply(gridc.wxGridTableMessage_SetId,(self,) + _args, _kwargs)
@@ -842,7 +857,6 @@ class wxGridPtr(wxScrolledWindowPtr):
         return val
     def GetTable(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetTable,(self,) + _args, _kwargs)
-        if val: val = wxGridTableBasePtr(val) 
         return val
     def SetTable(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetTable,(self,) + _args, _kwargs)
@@ -889,6 +903,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def GetBatchCount(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetBatchCount,(self,) + _args, _kwargs)
         return val
+    def ForceRefresh(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_ForceRefresh,(self,) + _args, _kwargs)
+        return val
     def IsEditable(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_IsEditable,(self,) + _args, _kwargs)
         return val
@@ -1031,6 +1048,12 @@ class wxGridPtr(wxScrolledWindowPtr):
         val = apply(gridc.wxGrid_GetCellHighlightColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
+    def GetCellHighlightPenWidth(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellHighlightPenWidth,(self,) + _args, _kwargs)
+        return val
+    def GetCellHighlightROPenWidth(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellHighlightROPenWidth,(self,) + _args, _kwargs)
+        return val
     def SetRowLabelSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetRowLabelSize,(self,) + _args, _kwargs)
         return val
@@ -1064,6 +1087,12 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetCellHighlightColour(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetCellHighlightColour,(self,) + _args, _kwargs)
         return val
+    def SetCellHighlightPenWidth(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellHighlightPenWidth,(self,) + _args, _kwargs)
+        return val
+    def SetCellHighlightROPenWidth(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellHighlightROPenWidth,(self,) + _args, _kwargs)
+        return val
     def EnableDragRowSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_EnableDragRowSize,(self,) + _args, _kwargs)
         return val
@@ -1315,6 +1344,18 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetMargins(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetMargins,(self,) + _args, _kwargs)
         return val
+    def GetGridWindow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetGridWindow,(self,) + _args, _kwargs)
+        return val
+    def GetGridRowLabelWindow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetGridRowLabelWindow,(self,) + _args, _kwargs)
+        return val
+    def GetGridColLabelWindow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetGridColLabelWindow,(self,) + _args, _kwargs)
+        return val
+    def GetGridCornerLabelWindow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetGridCornerLabelWindow,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxGrid instance at %s>" % (self.this,)
 class wxGrid(wxGridPtr):
@@ -1446,6 +1487,38 @@ class wxGridRangeSelectEvent(wxGridRangeSelectEventPtr):
 
 
 
+class wxGridEditorCreatedEventPtr(wxCommandEventPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetRow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridEditorCreatedEvent_GetRow,(self,) + _args, _kwargs)
+        return val
+    def GetCol(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridEditorCreatedEvent_GetCol,(self,) + _args, _kwargs)
+        return val
+    def GetControl(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridEditorCreatedEvent_GetControl,(self,) + _args, _kwargs)
+        return val
+    def SetRow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridEditorCreatedEvent_SetRow,(self,) + _args, _kwargs)
+        return val
+    def SetCol(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridEditorCreatedEvent_SetCol,(self,) + _args, _kwargs)
+        return val
+    def SetControl(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridEditorCreatedEvent_SetControl,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxGridEditorCreatedEvent instance at %s>" % (self.this,)
+class wxGridEditorCreatedEvent(wxGridEditorCreatedEventPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gridc.new_wxGridEditorCreatedEvent,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -1487,6 +1560,7 @@ wxEVT_GRID_CELL_CHANGE = gridc.wxEVT_GRID_CELL_CHANGE
 wxEVT_GRID_SELECT_CELL = gridc.wxEVT_GRID_SELECT_CELL
 wxEVT_GRID_EDITOR_SHOWN = gridc.wxEVT_GRID_EDITOR_SHOWN
 wxEVT_GRID_EDITOR_HIDDEN = gridc.wxEVT_GRID_EDITOR_HIDDEN
+wxEVT_GRID_EDITOR_CREATED = gridc.wxEVT_GRID_EDITOR_CREATED
 
 
 #-------------- USER INCLUDE -----------------------
@@ -1498,6 +1572,7 @@ wxEVT_GRID_EDITOR_HIDDEN = gridc.wxEVT_GRID_EDITOR_HIDDEN
 wx.wxGridEventPtr                  = wxGridEventPtr
 wx.wxGridSizeEventPtr              = wxGridSizeEventPtr
 wx.wxGridRangeSelectEventPtr       = wxGridRangeSelectEventPtr
+wx.wxGridEditorCreatedEventPtr     = wxGridEditorCreatedEventPtr
 wx.wxGridCellRendererPtr           = wxGridCellRendererPtr
 wx.wxPyGridCellRendererPtr         = wxPyGridCellRendererPtr
 wx.wxGridCellEditorPtr             = wxGridCellEditorPtr