a few bug fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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)
 
@@ -113,15 +116,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 +185,5 @@ if __name__ == '__main__':
 
 
 #---------------------------------------------------------------------------
+
+

wxPython/demo/Main.py

@@ -20,8 +20,8 @@ from   wxPython.html import wxHtmlWindow
 
 
 _treeList = [
-    ('New since last release', ['PyShellWindow',
-                                ]),
+    #('New since last release', ['PyShellWindow',
+    #                            ]),
 
     ('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
 
@@ -413,7 +413,7 @@ class MyApp(wxApp):
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
-        print showTip, index
+        #print showTip, index
         if showTip:
             tp = wxCreateFileTipProvider("data/tips.txt", index)
             showTip = wxShowTip(frame, tp)

wxPython/demo/wxGLCanvas.py

@@ -8,7 +8,7 @@ except ImportError:
 
 try:
     # The Python OpenGL package can be found at
-    # http://starship.python.net:9673/crew/da/Code/PyOpenGL/
+    # http://PyOpenGL.sourceforge.net/
     from OpenGL.GL import *
     from OpenGL.GLUT import *
     haveOpenGL = true
@@ -28,7 +28,7 @@ elif not haveOpenGL:
     def runTest(frame, nb, log):
         dlg = wxMessageDialog(frame,
                               'The OpenGL package was not found.  You can get it at\n'
-                              'http://starship.python.net:9673/crew/da/Code/PyOpenGL/',
+                              'http://PyOpenGL.sourceforge.net/',
                           'Sorry', wxOK | wxICON_INFORMATION)
         dlg.ShowModal()
         dlg.Destroy()
@@ -57,7 +57,8 @@ else:
 
     class CubeCanvas(wxGLCanvas):
         def __init__(self, parent):
-            wxGLCanvas.__init__(self, parent, -1)
+            wxGLCanvas.__init__(self, parent, -1) #,
+                                #attribList=[GL_RED_BITS, 4, GL_DOUBLEBUFFER] )
             EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
             EVT_SIZE(self, self.OnSize)
             EVT_PAINT(self, self.OnPaint)

wxPython/demo/wxTreeCtrl.py

@@ -137,6 +137,8 @@ class TestTreeCtrlPanel(wxPanel):
         self.log.WriteText("OnSelChanged: %s\n" % self.tree.GetItemText(self.item))
         self.log.WriteText("BoundingRect: %s\n" %
                            self.tree.GetBoundingRect(self.item, true))
+        #items = self.tree.GetSelections()
+        #print map(self.tree.GetItemText, items)
 
 
 
@@ -160,11 +162,6 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
-
-
 overview = """\
 A tree control presents information as a hierarchy, with items that may be expanded to show further items. Items in a tree control are referenced by wxTreeItemId handles.