fixed the last of the off-by-one errors (some are refixed, again...)

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

diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index bafd643cf296e6e87c08f03802fae8cf6fbef911..c073d48932d4783ca10368c23229e7b912e42e83 100644 (file)
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -1,11 +1,13 @@
 from wxPython.wx import *
 from wxPython.grid import *
 from wxPython.wx import *
 from wxPython.grid import *

+from wxPython.lib.mixins.grid import wxGridAutoEditMixin

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

-class SimpleGrid(wxGrid):
+class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin):

     def __init__(self, parent, log):
         wxGrid.__init__(self, parent, -1)
     def __init__(self, parent, log):
         wxGrid.__init__(self, parent, -1)

+        ##wxGridAutoEditMixin.__init__(self)

         self.log = log
         self.moveTo = None
 
         self.log = log
         self.moveTo = None
 


@@ -19,9 +21,16 @@ class SimpleGrid(wxGrid):
         self.SetCellValue(0, 0, "First cell")
         self.SetCellValue(1, 1, "Another cell")
         self.SetCellValue(2, 2, "Yet another cell")
         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.SetCellFont(0, 0, wxFont(12, wxROMAN, wxITALIC, wxNORMAL))
         self.SetCellTextColour(1, 1, wxRED)
         self.SetCellBackgroundColour(2, 2, wxCYAN)

+        self.SetReadOnly(3, 3, true)
+
+        self.SetCellEditor(5, 0, wxGridCellNumberEditor())
+        self.SetCellValue(5, 0, "123")
+        self.SetCellEditor(6, 0, wxGridCellFloatEditor())
+        self.SetCellValue(6, 0, "123.34")

 
         # attribute objects let you keep a set of formatting values
         # in one spot, and reuse them if needed
 
         # attribute objects let you keep a set of formatting values
         # in one spot, and reuse them if needed


@@ -37,6 +46,8 @@ class SimpleGrid(wxGrid):
         self.SetColLabelValue(1, "column")
         self.SetColLabelValue(2, "labels")
 
         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)
         # test all the events
         EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick)
         EVT_GRID_CELL_RIGHT_CLICK(self, self.OnCellRightClick)


@@ -57,6 +68,8 @@ class SimpleGrid(wxGrid):
 
         EVT_GRID_EDITOR_SHOWN(self, self.OnEditorShown)
         EVT_GRID_EDITOR_HIDDEN(self, self.OnEditorHidden)
 
         EVT_GRID_EDITOR_SHOWN(self, self.OnEditorShown)
         EVT_GRID_EDITOR_HIDDEN(self, self.OnEditorHidden)

+        EVT_GRID_EDITOR_CREATED(self, self.OnEditorCreated)
+

 
 
     def OnCellLeftClick(self, evt):
 
 
     def OnCellLeftClick(self, evt):


@@ -129,11 +142,12 @@ class SimpleGrid(wxGrid):
         if value == 'no good':
             self.moveTo = 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 OnIdle(self, evt):
         if self.moveTo != None:
             self.SetGridCursor(self.moveTo[0], self.moveTo[1])
             self.moveTo = None

-
+        evt.Skip()

 
 
     def OnSelectCell(self, evt):
 
 
     def OnSelectCell(self, evt):


@@ -149,9 +163,7 @@ class SimpleGrid(wxGrid):
         value = self.GetCellValue(row, col)
         if value == 'no good 2':
             return  # cancels the cell selection
         value = self.GetCellValue(row, col)
         if value == 'no good 2':
             return  # cancels the cell selection

-        else:
-            evt.Skip()
-
+        evt.Skip()

 
 
     def OnEditorShown(self, evt):
 
 
     def OnEditorShown(self, evt):


@@ -164,6 +176,11 @@ class SimpleGrid(wxGrid):
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))
         evt.Skip()
 
                        (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()))
+
+

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------