X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2131d850ee99b2bebed4cc8d1467493ad0c226a5..e17b6377be593ce71d722beb3cdcffb67baccf00:/wxPython/src/msw/grid.py

diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py
index 8f04d45fd0..c3ce9b7097 100644
--- a/wxPython/src/msw/grid.py
+++ b/wxPython/src/msw/grid.py
@@ -1109,7 +1109,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)
@@ -1118,19 +1118,19 @@ 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)
 
-    GridSelectCells = _grid.Grid_GridSelectCells
-    GridSelectRows = _grid.Grid_GridSelectRows
-    GridSelectColumns = _grid.Grid_GridSelectColumns
+    wxGridSelectCells = _grid.Grid_wxGridSelectCells
+    wxGridSelectRows = _grid.Grid_wxGridSelectRows
+    wxGridSelectColumns = _grid.Grid_wxGridSelectColumns
     SelectCells =   wxGridSelectCells
     SelectRows =    wxGridSelectRows
     SelectColumns = wxGridSelectColumns
 
     def CreateGrid(*args, **kwargs):
-        """CreateGrid(self, int numRows, int numCols, WXGRIDSELECTIONMODES selmode=GridSelectCells) -> bool"""
+        """CreateGrid(self, int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
         return _grid.Grid_CreateGrid(*args, **kwargs)
 
     def SetSelectionMode(*args, **kwargs):
@@ -1158,7 +1158,7 @@ class Grid(_windows.ScrolledWindow):
         return _grid.Grid_GetTable(*args, **kwargs)
 
     def SetTable(*args, **kwargs):
-        """SetTable(self, GridTableBase table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode=GridSelectCells) -> bool"""
+        """SetTable(self, GridTableBase table, bool takeOwnership=False, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
         return _grid.Grid_SetTable(*args, **kwargs)
 
     def ClearGrid(*args, **kwargs):
@@ -1273,7 +1273,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):
@@ -1400,6 +1400,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)
@@ -1492,6 +1504,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)
@@ -1632,6 +1656,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)