]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/mac/grid.py
Add docstrings and a dummy class to be used in builds that don't have wxSearchCtrl.
[wxWidgets.git] / wxPython / src / mac / grid.py
index 4cb321f50a32b5373c2a1eeaada232c728996ad8..4c0838bf04eef682e6dea39df4f483daa9305f15 100644 (file)
@@ -101,8 +101,7 @@ class GridCellWorker(object):
         """DecRef(self)"""
         return _grid.GridCellWorker_DecRef(*args, **kwargs)
 
-GridCellWorker_swigregister = _grid.GridCellWorker_swigregister
-GridCellWorker_swigregister(GridCellWorker)
+_grid.GridCellWorker_swigregister(GridCellWorker)
 cvar = _grid.cvar
 GridNoCellCoords = cvar.GridNoCellCoords
 GridNoCellRect = cvar.GridNoCellRect
@@ -112,8 +111,22 @@ 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
-GridCellRenderer_swigregister = _grid.GridCellRenderer_swigregister
-GridCellRenderer_swigregister(GridCellRenderer)
+    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):
     """Proxy of C++ PyGridCellRenderer class"""
@@ -122,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)"""
@@ -137,8 +150,7 @@ class PyGridCellRenderer(GridCellRenderer):
     base_SetParameters = wx._deprecated(base_SetParameters,
                                    "Please use PyGridCellRenderer.SetParameters instead.")
 
-PyGridCellRenderer_swigregister = _grid.PyGridCellRenderer_swigregister
-PyGridCellRenderer_swigregister(PyGridCellRenderer)
+_grid.PyGridCellRenderer_swigregister(PyGridCellRenderer)
 
 class GridCellStringRenderer(GridCellRenderer):
     """Proxy of C++ GridCellStringRenderer class"""
@@ -149,8 +161,7 @@ class GridCellStringRenderer(GridCellRenderer):
         _grid.GridCellStringRenderer_swiginit(self,_grid.new_GridCellStringRenderer(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellStringRenderer_swigregister = _grid.GridCellStringRenderer_swigregister
-GridCellStringRenderer_swigregister(GridCellStringRenderer)
+_grid.GridCellStringRenderer_swigregister(GridCellStringRenderer)
 
 class GridCellNumberRenderer(GridCellStringRenderer):
     """Proxy of C++ GridCellNumberRenderer class"""
@@ -161,8 +172,7 @@ class GridCellNumberRenderer(GridCellStringRenderer):
         _grid.GridCellNumberRenderer_swiginit(self,_grid.new_GridCellNumberRenderer(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellNumberRenderer_swigregister = _grid.GridCellNumberRenderer_swigregister
-GridCellNumberRenderer_swigregister(GridCellNumberRenderer)
+_grid.GridCellNumberRenderer_swigregister(GridCellNumberRenderer)
 
 class GridCellFloatRenderer(GridCellStringRenderer):
     """Proxy of C++ GridCellFloatRenderer class"""
@@ -189,8 +199,9 @@ class GridCellFloatRenderer(GridCellStringRenderer):
         """SetPrecision(self, int precision)"""
         return _grid.GridCellFloatRenderer_SetPrecision(*args, **kwargs)
 
-GridCellFloatRenderer_swigregister = _grid.GridCellFloatRenderer_swigregister
-GridCellFloatRenderer_swigregister(GridCellFloatRenderer)
+    Precision = property(GetPrecision,SetPrecision,doc="See `GetPrecision` and `SetPrecision`") 
+    Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") 
+_grid.GridCellFloatRenderer_swigregister(GridCellFloatRenderer)
 
 class GridCellBoolRenderer(GridCellRenderer):
     """Proxy of C++ GridCellBoolRenderer class"""
@@ -201,8 +212,7 @@ class GridCellBoolRenderer(GridCellRenderer):
         _grid.GridCellBoolRenderer_swiginit(self,_grid.new_GridCellBoolRenderer(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellBoolRenderer_swigregister = _grid.GridCellBoolRenderer_swigregister
-GridCellBoolRenderer_swigregister(GridCellBoolRenderer)
+_grid.GridCellBoolRenderer_swigregister(GridCellBoolRenderer)
 
 class GridCellDateTimeRenderer(GridCellStringRenderer):
     """Proxy of C++ GridCellDateTimeRenderer class"""
@@ -213,8 +223,7 @@ class GridCellDateTimeRenderer(GridCellStringRenderer):
         _grid.GridCellDateTimeRenderer_swiginit(self,_grid.new_GridCellDateTimeRenderer(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellDateTimeRenderer_swigregister = _grid.GridCellDateTimeRenderer_swigregister
-GridCellDateTimeRenderer_swigregister(GridCellDateTimeRenderer)
+_grid.GridCellDateTimeRenderer_swigregister(GridCellDateTimeRenderer)
 
 class GridCellEnumRenderer(GridCellStringRenderer):
     """Proxy of C++ GridCellEnumRenderer class"""
@@ -225,8 +234,7 @@ class GridCellEnumRenderer(GridCellStringRenderer):
         _grid.GridCellEnumRenderer_swiginit(self,_grid.new_GridCellEnumRenderer(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellEnumRenderer_swigregister = _grid.GridCellEnumRenderer_swigregister
-GridCellEnumRenderer_swigregister(GridCellEnumRenderer)
+_grid.GridCellEnumRenderer_swigregister(GridCellEnumRenderer)
 
 class GridCellAutoWrapStringRenderer(GridCellStringRenderer):
     """Proxy of C++ GridCellAutoWrapStringRenderer class"""
@@ -237,8 +245,7 @@ class GridCellAutoWrapStringRenderer(GridCellStringRenderer):
         _grid.GridCellAutoWrapStringRenderer_swiginit(self,_grid.new_GridCellAutoWrapStringRenderer(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellAutoWrapStringRenderer_swigregister = _grid.GridCellAutoWrapStringRenderer_swigregister
-GridCellAutoWrapStringRenderer_swigregister(GridCellAutoWrapStringRenderer)
+_grid.GridCellAutoWrapStringRenderer_swigregister(GridCellAutoWrapStringRenderer)
 
 class GridCellEditor(GridCellWorker):
     """Proxy of C++ GridCellEditor class"""
@@ -315,12 +322,12 @@ 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)
 
-GridCellEditor_swigregister = _grid.GridCellEditor_swigregister
-GridCellEditor_swigregister(GridCellEditor)
+    CellAttr = property(GetCellAttr,SetCellAttr,doc="See `GetCellAttr` and `SetCellAttr`") 
+    Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") 
+_grid.GridCellEditor_swigregister(GridCellEditor)
 
 class PyGridCellEditor(GridCellEditor):
     """Proxy of C++ PyGridCellEditor class"""
@@ -329,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)"""
@@ -384,8 +391,7 @@ class PyGridCellEditor(GridCellEditor):
     base_SetParameters = wx._deprecated(base_SetParameters,
                                    "Please use PyGridCellEditor.SetParameters instead.")
 
-PyGridCellEditor_swigregister = _grid.PyGridCellEditor_swigregister
-PyGridCellEditor_swigregister(PyGridCellEditor)
+_grid.PyGridCellEditor_swigregister(PyGridCellEditor)
 
 class GridCellTextEditor(GridCellEditor):
     """Proxy of C++ GridCellTextEditor class"""
@@ -400,8 +406,8 @@ class GridCellTextEditor(GridCellEditor):
         """GetValue(self) -> String"""
         return _grid.GridCellTextEditor_GetValue(*args, **kwargs)
 
-GridCellTextEditor_swigregister = _grid.GridCellTextEditor_swigregister
-GridCellTextEditor_swigregister(GridCellTextEditor)
+    Value = property(GetValue,doc="See `GetValue`") 
+_grid.GridCellTextEditor_swigregister(GridCellTextEditor)
 
 class GridCellNumberEditor(GridCellTextEditor):
     """Proxy of C++ GridCellNumberEditor class"""
@@ -412,8 +418,7 @@ class GridCellNumberEditor(GridCellTextEditor):
         _grid.GridCellNumberEditor_swiginit(self,_grid.new_GridCellNumberEditor(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellNumberEditor_swigregister = _grid.GridCellNumberEditor_swigregister
-GridCellNumberEditor_swigregister(GridCellNumberEditor)
+_grid.GridCellNumberEditor_swigregister(GridCellNumberEditor)
 
 class GridCellFloatEditor(GridCellTextEditor):
     """Proxy of C++ GridCellFloatEditor class"""
@@ -424,8 +429,7 @@ class GridCellFloatEditor(GridCellTextEditor):
         _grid.GridCellFloatEditor_swiginit(self,_grid.new_GridCellFloatEditor(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellFloatEditor_swigregister = _grid.GridCellFloatEditor_swigregister
-GridCellFloatEditor_swigregister(GridCellFloatEditor)
+_grid.GridCellFloatEditor_swigregister(GridCellFloatEditor)
 
 class GridCellBoolEditor(GridCellEditor):
     """Proxy of C++ GridCellBoolEditor class"""
@@ -436,12 +440,26 @@ class GridCellBoolEditor(GridCellEditor):
         _grid.GridCellBoolEditor_swiginit(self,_grid.new_GridCellBoolEditor(*args, **kwargs))
         self._setOORInfo(self)
 
-    def GetValue(*args, **kwargs):
-        """GetValue(self) -> String"""
-        return _grid.GridCellBoolEditor_GetValue(*args, **kwargs)
+    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)
 
-GridCellBoolEditor_swigregister = _grid.GridCellBoolEditor_swigregister
-GridCellBoolEditor_swigregister(GridCellBoolEditor)
+    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"""
@@ -452,12 +470,7 @@ class GridCellChoiceEditor(GridCellEditor):
         _grid.GridCellChoiceEditor_swiginit(self,_grid.new_GridCellChoiceEditor(*args, **kwargs))
         self._setOORInfo(self)
 
-    def GetValue(*args, **kwargs):
-        """GetValue(self) -> String"""
-        return _grid.GridCellChoiceEditor_GetValue(*args, **kwargs)
-
-GridCellChoiceEditor_swigregister = _grid.GridCellChoiceEditor_swigregister
-GridCellChoiceEditor_swigregister(GridCellChoiceEditor)
+_grid.GridCellChoiceEditor_swigregister(GridCellChoiceEditor)
 
 class GridCellEnumEditor(GridCellChoiceEditor):
     """Proxy of C++ GridCellEnumEditor class"""
@@ -468,8 +481,7 @@ class GridCellEnumEditor(GridCellChoiceEditor):
         _grid.GridCellEnumEditor_swiginit(self,_grid.new_GridCellEnumEditor(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellEnumEditor_swigregister = _grid.GridCellEnumEditor_swigregister
-GridCellEnumEditor_swigregister(GridCellEnumEditor)
+_grid.GridCellEnumEditor_swigregister(GridCellEnumEditor)
 
 class GridCellAutoWrapStringEditor(GridCellTextEditor):
     """Proxy of C++ GridCellAutoWrapStringEditor class"""
@@ -480,8 +492,7 @@ class GridCellAutoWrapStringEditor(GridCellTextEditor):
         _grid.GridCellAutoWrapStringEditor_swiginit(self,_grid.new_GridCellAutoWrapStringEditor(*args, **kwargs))
         self._setOORInfo(self)
 
-GridCellAutoWrapStringEditor_swigregister = _grid.GridCellAutoWrapStringEditor_swigregister
-GridCellAutoWrapStringEditor_swigregister(GridCellAutoWrapStringEditor)
+_grid.GridCellAutoWrapStringEditor_swigregister(GridCellAutoWrapStringEditor)
 
 class GridCellAttr(object):
     """Proxy of C++ GridCellAttr class"""
@@ -636,8 +647,14 @@ class GridCellAttr(object):
         """SetDefAttr(self, GridCellAttr defAttr)"""
         return _grid.GridCellAttr_SetDefAttr(*args, **kwargs)
 
-GridCellAttr_swigregister = _grid.GridCellAttr_swigregister
-GridCellAttr_swigregister(GridCellAttr)
+    Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    Kind = property(GetKind,SetKind,doc="See `GetKind` and `SetKind`") 
+    Overflow = property(GetOverflow,SetOverflow,doc="See `GetOverflow` and `SetOverflow`") 
+    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 
+_grid.GridCellAttr_swigregister(GridCellAttr)
 
 class GridCellAttrProvider(object):
     """Proxy of C++ GridCellAttrProvider class"""
@@ -676,8 +693,7 @@ class GridCellAttrProvider(object):
         """UpdateAttrCols(self, size_t pos, int numCols)"""
         return _grid.GridCellAttrProvider_UpdateAttrCols(*args, **kwargs)
 
-GridCellAttrProvider_swigregister = _grid.GridCellAttrProvider_swigregister
-GridCellAttrProvider_swigregister(GridCellAttrProvider)
+_grid.GridCellAttrProvider_swigregister(GridCellAttrProvider)
 
 class PyGridCellAttrProvider(GridCellAttrProvider):
     """Proxy of C++ PyGridCellAttrProvider class"""
@@ -686,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)"""
@@ -728,8 +744,7 @@ class PyGridCellAttrProvider(GridCellAttrProvider):
     base_SetColAttr = wx._deprecated(base_SetColAttr,
                                    "Please use PyGridCellAttrProvider.SetColAttr instead.")
 
-PyGridCellAttrProvider_swigregister = _grid.PyGridCellAttrProvider_swigregister
-PyGridCellAttrProvider_swigregister(PyGridCellAttrProvider)
+_grid.PyGridCellAttrProvider_swigregister(PyGridCellAttrProvider)
 
 class GridTableBase(_core.Object):
     """Proxy of C++ GridTableBase class"""
@@ -878,8 +893,11 @@ class GridTableBase(_core.Object):
         """SetColAttr(self, GridCellAttr attr, int col)"""
         return _grid.GridTableBase_SetColAttr(*args, **kwargs)
 
-GridTableBase_swigregister = _grid.GridTableBase_swigregister
-GridTableBase_swigregister(GridTableBase)
+    AttrProvider = property(GetAttrProvider,SetAttrProvider,doc="See `GetAttrProvider` and `SetAttrProvider`") 
+    NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") 
+    NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") 
+    View = property(GetView,SetView,doc="See `GetView` and `SetView`") 
+_grid.GridTableBase_swigregister(GridTableBase)
 
 class PyGridTableBase(GridTableBase):
     """Proxy of C++ PyGridTableBase class"""
@@ -888,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)"""
@@ -900,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)
@@ -999,8 +1016,7 @@ class PyGridTableBase(GridTableBase):
     base_SetColAttr = wx._deprecated(base_SetColAttr,
                                    "Please use PyGridTableBase.SetColAttr instead.")
 
-PyGridTableBase_swigregister = _grid.PyGridTableBase_swigregister
-PyGridTableBase_swigregister(PyGridTableBase)
+_grid.PyGridTableBase_swigregister(PyGridTableBase)
 
 class GridStringTable(GridTableBase):
     """Proxy of C++ GridStringTable class"""
@@ -1011,8 +1027,7 @@ class GridStringTable(GridTableBase):
         _grid.GridStringTable_swiginit(self,_grid.new_GridStringTable(*args, **kwargs))
         self._setOORInfo(self)
 
-GridStringTable_swigregister = _grid.GridStringTable_swigregister
-GridStringTable_swigregister(GridStringTable)
+_grid.GridStringTable_swigregister(GridStringTable)
 
 GRIDTABLE_REQUEST_VIEW_GET_VALUES = _grid.GRIDTABLE_REQUEST_VIEW_GET_VALUES
 GRIDTABLE_REQUEST_VIEW_SEND_VALUES = _grid.GRIDTABLE_REQUEST_VIEW_SEND_VALUES
@@ -1063,8 +1078,11 @@ class GridTableMessage(object):
         """GetCommandInt2(self) -> int"""
         return _grid.GridTableMessage_GetCommandInt2(*args, **kwargs)
 
-GridTableMessage_swigregister = _grid.GridTableMessage_swigregister
-GridTableMessage_swigregister(GridTableMessage)
+    CommandInt = property(GetCommandInt,SetCommandInt,doc="See `GetCommandInt` and `SetCommandInt`") 
+    CommandInt2 = property(GetCommandInt2,SetCommandInt2,doc="See `GetCommandInt2` and `SetCommandInt2`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    TableObject = property(GetTableObject,SetTableObject,doc="See `GetTableObject` and `SetTableObject`") 
+_grid.GridTableMessage_swigregister(GridTableMessage)
 
 class GridCellCoords(object):
     """Proxy of C++ GridCellCoords class"""
@@ -1125,8 +1143,9 @@ class GridCellCoords(object):
         elif index == 1: self.SetCol(val)
         else: raise IndexError
 
-GridCellCoords_swigregister = _grid.GridCellCoords_swigregister
-GridCellCoords_swigregister(GridCellCoords)
+    Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") 
+    Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") 
+_grid.GridCellCoords_swigregister(GridCellCoords)
 
 class Grid(_windows.ScrolledWindow):
     """Proxy of C++ Grid class"""
@@ -1136,7 +1155,7 @@ class Grid(_windows.ScrolledWindow):
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=WANTS_CHARS, 
-            String name=PanelNameStr) -> Grid
+            String name=wxPyGridNameStr) -> Grid
         """
         _grid.Grid_swiginit(self,_grid.new_Grid(*args, **kwargs))
         self._setOORInfo(self)
@@ -1145,7 +1164,7 @@ class Grid(_windows.ScrolledWindow):
         """
         Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=WANTS_CHARS, 
-            String name=PanelNameStr) -> bool
+            String name=wxPyGridNameStr) -> bool
         """
         return _grid.Grid_Create(*args, **kwargs)
 
@@ -1300,7 +1319,7 @@ class Grid(_windows.ScrolledWindow):
         return _grid.Grid_YToRow(*args, **kwargs)
 
     def XToCol(*args, **kwargs):
-        """XToCol(self, int x) -> int"""
+        """XToCol(self, int x, bool clipToMinMax=False) -> int"""
         return _grid.Grid_XToCol(*args, **kwargs)
 
     def YToEdgeOfRow(*args, **kwargs):
@@ -1427,6 +1446,18 @@ class Grid(_windows.ScrolledWindow):
         """GetGridLineColour(self) -> Colour"""
         return _grid.Grid_GetGridLineColour(*args, **kwargs)
 
+    def GetDefaultGridLinePen(*args, **kwargs):
+        """GetDefaultGridLinePen(self) -> wxPen"""
+        return _grid.Grid_GetDefaultGridLinePen(*args, **kwargs)
+
+    def GetRowGridLinePen(*args, **kwargs):
+        """GetRowGridLinePen(self, int row) -> wxPen"""
+        return _grid.Grid_GetRowGridLinePen(*args, **kwargs)
+
+    def GetColGridLinePen(*args, **kwargs):
+        """GetColGridLinePen(self, int col) -> wxPen"""
+        return _grid.Grid_GetColGridLinePen(*args, **kwargs)
+
     def GetCellHighlightColour(*args, **kwargs):
         """GetCellHighlightColour(self) -> Colour"""
         return _grid.Grid_GetCellHighlightColour(*args, **kwargs)
@@ -1519,6 +1550,18 @@ class Grid(_windows.ScrolledWindow):
         """CanDragColSize(self) -> bool"""
         return _grid.Grid_CanDragColSize(*args, **kwargs)
 
+    def EnableDragColMove(*args, **kwargs):
+        """EnableDragColMove(self, bool enable=True)"""
+        return _grid.Grid_EnableDragColMove(*args, **kwargs)
+
+    def DisableDragColMove(*args, **kwargs):
+        """DisableDragColMove(self)"""
+        return _grid.Grid_DisableDragColMove(*args, **kwargs)
+
+    def CanDragColMove(*args, **kwargs):
+        """CanDragColMove(self) -> bool"""
+        return _grid.Grid_CanDragColMove(*args, **kwargs)
+
     def EnableDragGridSize(*args, **kwargs):
         """EnableDragGridSize(self, bool enable=True)"""
         return _grid.Grid_EnableDragGridSize(*args, **kwargs)
@@ -1628,7 +1671,7 @@ class Grid(_windows.ScrolledWindow):
         return _grid.Grid_GetDefaultCellAlignment(*args, **kwargs)
 
     def GetCellAlignment(*args, **kwargs):
-        """GetCellAlignment() -> (horiz, vert)"""
+        """GetCellAlignment(int row, int col) -> (horiz, vert)"""
         return _grid.Grid_GetCellAlignment(*args, **kwargs)
 
     def GetDefaultCellOverflow(*args, **kwargs):
@@ -1659,6 +1702,18 @@ class Grid(_windows.ScrolledWindow):
         """SetColSize(self, int col, int width)"""
         return _grid.Grid_SetColSize(*args, **kwargs)
 
+    def GetColAt(*args, **kwargs):
+        """GetColAt(self, int colPos) -> int"""
+        return _grid.Grid_GetColAt(*args, **kwargs)
+
+    def SetColPos(*args, **kwargs):
+        """SetColPos(self, int colID, int newPos)"""
+        return _grid.Grid_SetColPos(*args, **kwargs)
+
+    def GetColPos(*args, **kwargs):
+        """GetColPos(self, int colID) -> int"""
+        return _grid.Grid_GetColPos(*args, **kwargs)
+
     def AutoSizeColumn(*args, **kwargs):
         """AutoSizeColumn(self, int col, bool setAsMin=True)"""
         return _grid.Grid_AutoSizeColumn(*args, **kwargs)
@@ -1968,8 +2023,54 @@ class Grid(_windows.ScrolledWindow):
         return _grid.Grid_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Grid_swigregister = _grid.Grid_swigregister
-Grid_swigregister(Grid)
+    BatchCount = property(GetBatchCount,doc="See `GetBatchCount`") 
+    CellHighlightColour = property(GetCellHighlightColour,SetCellHighlightColour,doc="See `GetCellHighlightColour` and `SetCellHighlightColour`") 
+    CellHighlightPenWidth = property(GetCellHighlightPenWidth,SetCellHighlightPenWidth,doc="See `GetCellHighlightPenWidth` and `SetCellHighlightPenWidth`") 
+    CellHighlightROPenWidth = property(GetCellHighlightROPenWidth,SetCellHighlightROPenWidth,doc="See `GetCellHighlightROPenWidth` and `SetCellHighlightROPenWidth`") 
+    CellSize = property(GetCellSize,SetCellSize,doc="See `GetCellSize` and `SetCellSize`") 
+    ColLabelAlignment = property(GetColLabelAlignment,SetColLabelAlignment,doc="See `GetColLabelAlignment` and `SetColLabelAlignment`") 
+    ColLabelSize = property(GetColLabelSize,SetColLabelSize,doc="See `GetColLabelSize` and `SetColLabelSize`") 
+    ColLabelTextOrientation = property(GetColLabelTextOrientation,SetColLabelTextOrientation,doc="See `GetColLabelTextOrientation` and `SetColLabelTextOrientation`") 
+    ColMinimalAcceptableWidth = property(GetColMinimalAcceptableWidth,SetColMinimalAcceptableWidth,doc="See `GetColMinimalAcceptableWidth` and `SetColMinimalAcceptableWidth`") 
+    DefaultCellAlignment = property(GetDefaultCellAlignment,SetDefaultCellAlignment,doc="See `GetDefaultCellAlignment` and `SetDefaultCellAlignment`") 
+    DefaultCellBackgroundColour = property(GetDefaultCellBackgroundColour,SetDefaultCellBackgroundColour,doc="See `GetDefaultCellBackgroundColour` and `SetDefaultCellBackgroundColour`") 
+    DefaultCellFont = property(GetDefaultCellFont,SetDefaultCellFont,doc="See `GetDefaultCellFont` and `SetDefaultCellFont`") 
+    DefaultCellOverflow = property(GetDefaultCellOverflow,SetDefaultCellOverflow,doc="See `GetDefaultCellOverflow` and `SetDefaultCellOverflow`") 
+    DefaultCellTextColour = property(GetDefaultCellTextColour,SetDefaultCellTextColour,doc="See `GetDefaultCellTextColour` and `SetDefaultCellTextColour`") 
+    DefaultColLabelSize = property(GetDefaultColLabelSize,doc="See `GetDefaultColLabelSize`") 
+    DefaultColSize = property(GetDefaultColSize,SetDefaultColSize,doc="See `GetDefaultColSize` and `SetDefaultColSize`") 
+    DefaultEditor = property(GetDefaultEditor,SetDefaultEditor,doc="See `GetDefaultEditor` and `SetDefaultEditor`") 
+    DefaultGridLinePen = property(GetDefaultGridLinePen,doc="See `GetDefaultGridLinePen`") 
+    DefaultRenderer = property(GetDefaultRenderer,SetDefaultRenderer,doc="See `GetDefaultRenderer` and `SetDefaultRenderer`") 
+    DefaultRowLabelSize = property(GetDefaultRowLabelSize,doc="See `GetDefaultRowLabelSize`") 
+    DefaultRowSize = property(GetDefaultRowSize,SetDefaultRowSize,doc="See `GetDefaultRowSize` and `SetDefaultRowSize`") 
+    GridColLabelWindow = property(GetGridColLabelWindow,doc="See `GetGridColLabelWindow`") 
+    GridCornerLabelWindow = property(GetGridCornerLabelWindow,doc="See `GetGridCornerLabelWindow`") 
+    GridCursorCol = property(GetGridCursorCol,doc="See `GetGridCursorCol`") 
+    GridCursorRow = property(GetGridCursorRow,doc="See `GetGridCursorRow`") 
+    GridLineColour = property(GetGridLineColour,SetGridLineColour,doc="See `GetGridLineColour` and `SetGridLineColour`") 
+    GridRowLabelWindow = property(GetGridRowLabelWindow,doc="See `GetGridRowLabelWindow`") 
+    GridWindow = property(GetGridWindow,doc="See `GetGridWindow`") 
+    LabelBackgroundColour = property(GetLabelBackgroundColour,SetLabelBackgroundColour,doc="See `GetLabelBackgroundColour` and `SetLabelBackgroundColour`") 
+    LabelFont = property(GetLabelFont,SetLabelFont,doc="See `GetLabelFont` and `SetLabelFont`") 
+    LabelTextColour = property(GetLabelTextColour,SetLabelTextColour,doc="See `GetLabelTextColour` and `SetLabelTextColour`") 
+    NumberCols = property(GetNumberCols,doc="See `GetNumberCols`") 
+    NumberRows = property(GetNumberRows,doc="See `GetNumberRows`") 
+    RowLabelAlignment = property(GetRowLabelAlignment,SetRowLabelAlignment,doc="See `GetRowLabelAlignment` and `SetRowLabelAlignment`") 
+    RowLabelSize = property(GetRowLabelSize,SetRowLabelSize,doc="See `GetRowLabelSize` and `SetRowLabelSize`") 
+    RowMinimalAcceptableHeight = property(GetRowMinimalAcceptableHeight,SetRowMinimalAcceptableHeight,doc="See `GetRowMinimalAcceptableHeight` and `SetRowMinimalAcceptableHeight`") 
+    ScrollLineX = property(GetScrollLineX,SetScrollLineX,doc="See `GetScrollLineX` and `SetScrollLineX`") 
+    ScrollLineY = property(GetScrollLineY,SetScrollLineY,doc="See `GetScrollLineY` and `SetScrollLineY`") 
+    SelectedCells = property(GetSelectedCells,doc="See `GetSelectedCells`") 
+    SelectedCols = property(GetSelectedCols,doc="See `GetSelectedCols`") 
+    SelectedRows = property(GetSelectedRows,doc="See `GetSelectedRows`") 
+    SelectionBackground = property(GetSelectionBackground,SetSelectionBackground,doc="See `GetSelectionBackground` and `SetSelectionBackground`") 
+    SelectionBlockBottomRight = property(GetSelectionBlockBottomRight,doc="See `GetSelectionBlockBottomRight`") 
+    SelectionBlockTopLeft = property(GetSelectionBlockTopLeft,doc="See `GetSelectionBlockTopLeft`") 
+    SelectionForeground = property(GetSelectionForeground,SetSelectionForeground,doc="See `GetSelectionForeground` and `SetSelectionForeground`") 
+    SelectionMode = property(GetSelectionMode,SetSelectionMode,doc="See `GetSelectionMode` and `SetSelectionMode`") 
+    Table = property(GetTable,SetTable,doc="See `GetTable` and `SetTable`") 
+_grid.Grid_swigregister(Grid)
 
 def PreGrid(*args, **kwargs):
     """PreGrid() -> Grid"""
@@ -1999,7 +2100,7 @@ class GridEvent(_core.NotifyEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, int id, wxEventType type, Grid obj, int row=-1, int col=-1, 
+        __init__(self, int id, EventType type, Grid obj, int row=-1, int col=-1, 
             int x=-1, int y=-1, bool sel=True, bool control=False, 
             bool shift=False, bool alt=False, 
             bool meta=False) -> GridEvent
@@ -2041,8 +2142,10 @@ class GridEvent(_core.NotifyEvent):
         """CmdDown(self) -> bool"""
         return _grid.GridEvent_CmdDown(*args, **kwargs)
 
-GridEvent_swigregister = _grid.GridEvent_swigregister
-GridEvent_swigregister(GridEvent)
+    Col = property(GetCol,doc="See `GetCol`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    Row = property(GetRow,doc="See `GetRow`") 
+_grid.GridEvent_swigregister(GridEvent)
 
 class GridSizeEvent(_core.NotifyEvent):
     """Proxy of C++ GridSizeEvent class"""
@@ -2050,7 +2153,7 @@ class GridSizeEvent(_core.NotifyEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, int id, wxEventType type, Grid obj, int rowOrCol=-1, 
+        __init__(self, int id, EventType type, Grid obj, int rowOrCol=-1, 
             int x=-1, int y=-1, bool control=False, bool shift=False, 
             bool alt=False, bool meta=False) -> GridSizeEvent
         """
@@ -2083,8 +2186,9 @@ class GridSizeEvent(_core.NotifyEvent):
         """CmdDown(self) -> bool"""
         return _grid.GridSizeEvent_CmdDown(*args, **kwargs)
 
-GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
-GridSizeEvent_swigregister(GridSizeEvent)
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    RowOrCol = property(GetRowOrCol,doc="See `GetRowOrCol`") 
+_grid.GridSizeEvent_swigregister(GridSizeEvent)
 
 class GridRangeSelectEvent(_core.NotifyEvent):
     """Proxy of C++ GridRangeSelectEvent class"""
@@ -2092,10 +2196,10 @@ class GridRangeSelectEvent(_core.NotifyEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, int id, wxEventType type, Grid obj, GridCellCoords topLeft, 
+        __init__(self, int id, EventType type, Grid obj, GridCellCoords topLeft, 
             GridCellCoords bottomRight, bool sel=True, 
-            bool control=False, bool shift=False, 
-            bool alt=False, bool meta=False) -> GridRangeSelectEvent
+            bool control=False, bool shift=False, bool alt=False, 
+            bool meta=False) -> GridRangeSelectEvent
         """
         _grid.GridRangeSelectEvent_swiginit(self,_grid.new_GridRangeSelectEvent(*args, **kwargs))
     def GetTopLeftCoords(*args, **kwargs):
@@ -2146,8 +2250,13 @@ class GridRangeSelectEvent(_core.NotifyEvent):
         """CmdDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs)
 
-GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
-GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
+    BottomRightCoords = property(GetBottomRightCoords,doc="See `GetBottomRightCoords`") 
+    BottomRow = property(GetBottomRow,doc="See `GetBottomRow`") 
+    LeftCol = property(GetLeftCol,doc="See `GetLeftCol`") 
+    RightCol = property(GetRightCol,doc="See `GetRightCol`") 
+    TopLeftCoords = property(GetTopLeftCoords,doc="See `GetTopLeftCoords`") 
+    TopRow = property(GetTopRow,doc="See `GetTopRow`") 
+_grid.GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 
 class GridEditorCreatedEvent(_core.CommandEvent):
     """Proxy of C++ GridEditorCreatedEvent class"""
@@ -2155,7 +2264,7 @@ class GridEditorCreatedEvent(_core.CommandEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, int id, wxEventType type, Object obj, int row, int col, 
+        __init__(self, int id, EventType type, Object obj, int row, int col, 
             Control ctrl) -> GridEditorCreatedEvent
         """
         _grid.GridEditorCreatedEvent_swiginit(self,_grid.new_GridEditorCreatedEvent(*args, **kwargs))
@@ -2183,8 +2292,10 @@ class GridEditorCreatedEvent(_core.CommandEvent):
         """SetControl(self, Control ctrl)"""
         return _grid.GridEditorCreatedEvent_SetControl(*args, **kwargs)
 
-GridEditorCreatedEvent_swigregister = _grid.GridEditorCreatedEvent_swigregister
-GridEditorCreatedEvent_swigregister(GridEditorCreatedEvent)
+    Col = property(GetCol,SetCol,doc="See `GetCol` and `SetCol`") 
+    Control = property(GetControl,SetControl,doc="See `GetControl` and `SetControl`") 
+    Row = property(GetRow,SetRow,doc="See `GetRow` and `SetRow`") 
+_grid.GridEditorCreatedEvent_swigregister(GridEditorCreatedEvent)
 
 wxEVT_GRID_CELL_LEFT_CLICK = _grid.wxEVT_GRID_CELL_LEFT_CLICK
 wxEVT_GRID_CELL_RIGHT_CLICK = _grid.wxEVT_GRID_CELL_RIGHT_CLICK