corrections to dynamic loading for Darwin

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

diff --git a/wxPython/demo/GridCustEditor.py b/wxPython/demo/GridCustEditor.py
index f90ea1f2f5ced8a9bc0977bd3fa68e1d36c143da..27bba1562d7e13bc467c9fd8c3e69408cbe0ebd0 100644 (file)
--- a/wxPython/demo/GridCustEditor.py
+++ b/wxPython/demo/GridCustEditor.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python

 
 from wxPython.wx import *
 from wxPython.grid import *
 
 from wxPython.wx import *
 from wxPython.grid import *


@@ -46,7 +45,8 @@ class MyCellEditor(wxPyGridCellEditor):
         PaintBackground and do something meaningful there.
         """
         self.log.write("MyCellEditor: SetSize %s\n" % rect)
         PaintBackground and do something meaningful there.
         """
         self.log.write("MyCellEditor: SetSize %s\n" % rect)

-        self._tc.SetDimensions(rect.x, rect.y, rect.width+2, rect.height+2)
+        self._tc.SetDimensions(rect.x, rect.y, rect.width+2, rect.height+2,
+                               wxSIZE_ALLOW_MINUS_ONE)

 
 
     def Show(self, show, attr):
 
 
     def Show(self, show, attr):


@@ -124,7 +124,8 @@ class MyCellEditor(wxPyGridCellEditor):
         ## Oops, there's a bug here, we'll have to do it ourself..
         ##return self.base_IsAcceptedKey(evt)
 
         ## Oops, there's a bug here, we'll have to do it ourself..
         ##return self.base_IsAcceptedKey(evt)
 

-        return not evt.HasModifiers() and evt.GetKeyCode() != WXK_SHIFT
+        return (not (evt.ControlDown() or evt.AltDown()) and
+                evt.GetKeyCode() != WXK_SHIFT)

 
 
     def StartingKey(self, evt):
 
 
     def StartingKey(self, evt):


@@ -210,6 +211,7 @@ class GridEditorTest(wxGrid):
         self.SetColSize(1, 150)
         self.SetColSize(2, 150)
 
         self.SetColSize(1, 150)
         self.SetColSize(2, 150)
 

+

 #---------------------------------------------------------------------------
 
 class TestFrame(wxFrame):
 #---------------------------------------------------------------------------
 
 class TestFrame(wxFrame):