In GetPath(), don't append separator if there's already one at the end

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

diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index 96a4a200f55721ad164608d6e9a75b12b5d5e83f..9857e22ae09847bc4bc99be011979192d5a46dc2 100644 (file)
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -4,16 +4,17 @@ from wxPython.lib.mixins.grid import wxGridAutoEditMixin
 
 #---------------------------------------------------------------------------
 
-class SimpleGrid(wxGrid, wxGridAutoEditMixin):
+class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin):
     def __init__(self, parent, log):
         wxGrid.__init__(self, parent, -1)
-        wxGridAutoEditMixin.__init__(self)
+        ##wxGridAutoEditMixin.__init__(self)
         self.log = log
         self.moveTo = None
 
         EVT_IDLE(self, self.OnIdle)
 
         self.CreateGrid(25, 25)
+        ##self.EnableEditing(false)
 
         # simple cell formatting
         self.SetColSize(3, 200)
@@ -31,6 +32,10 @@ class SimpleGrid(wxGrid, wxGridAutoEditMixin):
         self.SetCellValue(5, 0, "123")
         self.SetCellEditor(6, 0, wxGridCellFloatEditor())
         self.SetCellValue(6, 0, "123.34")
+        self.SetCellEditor(7, 0, wxGridCellNumberEditor())
+
+        self.SetCellValue(6, 3, "You can veto editing this cell")
+
 
         # attribute objects let you keep a set of formatting values
         # in one spot, and reuse them if needed
@@ -167,15 +172,29 @@ class SimpleGrid(wxGrid, wxGridAutoEditMixin):
 
 
     def OnEditorShown(self, evt):
+        if evt.GetRow() == 6 and evt.GetCol() == 3 and \
+           wxMessageBox("Are you sure you wish to edit this cell?",
+                        "Checking", wxYES_NO) == wxNO:
+            evt.Veto()
+            return
+
         self.log.write("OnEditorShown: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))
         evt.Skip()
 
+
     def OnEditorHidden(self, evt):
+        if evt.GetRow() == 6 and evt.GetCol() == 3 and \
+           wxMessageBox("Are you sure you wish to  finish editing this cell?",
+                        "Checking", wxYES_NO) == wxNO:
+            evt.Veto()
+            return
+
         self.log.write("OnEditorHidden: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))
         evt.Skip()
 
+
     def OnEditorCreated(self, evt):
         self.log.write("OnEditorCreated: (%d, %d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetControl()))