merged fixes for accel and command event non propagation from 2.2

[wxWidgets.git] / wxPython / demo / GridSimple.py

diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index f816e7a3f4c0b5abee65f12e685bc1ee2985fed5..215eb584904b2fcf8055bcab794ce79562d013eb 100644 (file)
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -7,6 +7,9 @@ class SimpleGrid(wxGrid):
     def __init__(self, parent, log):
         wxGrid.__init__(self, parent, -1)
         self.log = log
+        self.moveTo = None
+
+        EVT_IDLE(self, self.OnIdle)
 
         self.CreateGrid(25, 25)
 
@@ -16,9 +19,12 @@ class SimpleGrid(wxGrid):
         self.SetCellValue(0, 0, "First cell")
         self.SetCellValue(1, 1, "Another cell")
         self.SetCellValue(2, 2, "Yet another cell")
+        self.SetCellValue(3, 3, "This cell is read-only")
         self.SetCellFont(0, 0, wxFont(12, wxROMAN, wxITALIC, wxNORMAL))
         self.SetCellTextColour(1, 1, wxRED)
         self.SetCellBackgroundColour(2, 2, wxCYAN)
+        self.SetReadOnly(3, 3, true)
+
 
         # attribute objects let you keep a set of formatting values
         # in one spot, and reuse them if needed
@@ -34,6 +40,8 @@ class SimpleGrid(wxGrid):
         self.SetColLabelValue(1, "column")
         self.SetColLabelValue(2, "labels")
 
+        self.SetColLabelAlignment(wxALIGN_LEFT, wxALIGN_BOTTOM)
+
         # test all the events
         EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick)
         EVT_GRID_CELL_RIGHT_CLICK(self, self.OnCellRightClick)
@@ -113,15 +121,43 @@ class SimpleGrid(wxGrid):
                            (evt.GetTopLeftCoords(), evt.GetBottomRightCoords()))
         evt.Skip()
 
+
     def OnCellChange(self, evt):
         self.log.write("OnCellChange: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))
-        evt.Skip()
+
+        # Show how to stay in a cell that has bad data.  We can't just
+        # call SetGridCursor here since we are nested inside one so it
+        # won't have any effect.  Instead, set coordinants to move to in
+        # idle time.
+        value = self.GetCellValue(evt.GetRow(), evt.GetCol())
+        if value == 'no good':
+            self.moveTo = evt.GetRow(), evt.GetCol()
+
+    def OnIdle(self, evt):
+        if self.moveTo != None:
+            self.SetGridCursor(self.moveTo[0], self.moveTo[1])
+            self.moveTo = None
+
+
 
     def OnSelectCell(self, evt):
         self.log.write("OnSelectCell: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))
-        evt.Skip()
+
+        # Another way to stay in a cell that has a bad value...
+        row = self.GetGridCursorRow()
+        col = self.GetGridCursorCol()
+        if self.IsCellEditControlEnabled():
+            self.HideCellEditControl()
+            self.DisableCellEditControl()
+        value = self.GetCellValue(row, col)
+        if value == 'no good 2':
+            return  # cancels the cell selection
+        else:
+            evt.Skip()
+
+
 
     def OnEditorShown(self, evt):
         self.log.write("OnEditorShown: (%d,%d) %s\n" %
@@ -154,3 +190,5 @@ if __name__ == '__main__':
 
 
 #---------------------------------------------------------------------------
+
+