X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fa876ca9ec87e90605808bfcab4d4226965dbad..68fc5c8025e38b9d827383fbfe7ce509ae331c1f:/wxPython/demo/GridSimple.py

diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index fca404d151..0748d09f7e 100644
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -1,14 +1,3 @@
-# 11/6/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for V2.5
-# o The mixin features were all commented out. Is it broke? Should it even
-#   be in the source? Or is it left as an exercise to the reader? 
-#
-# 11/25/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Robin confirms, this is tutorial code. But be warned! It has not been
-#   converted OR tested!
-#
 
 import  wx
 import  wx.grid             as  gridlib
@@ -25,7 +14,7 @@ class SimpleGrid(gridlib.Grid): ##, mixins.GridAutoEditMixin):
 
         self.Bind(wx.EVT_IDLE, self.OnIdle)
 
-        self.CreateGrid(25, 25) #, wxGrid.wxGridSelectRows)
+        self.CreateGrid(25, 25)#, gridlib.Grid.SelectRows)
         ##self.EnableEditing(False)
 
         # simple cell formatting
@@ -68,7 +57,7 @@ class SimpleGrid(gridlib.Grid): ##, mixins.GridAutoEditMixin):
         self.SetColLabelAlignment(wx.ALIGN_LEFT, wx.ALIGN_BOTTOM)
 
         #self.SetDefaultCellOverflow(False)
-        #r = wxGridCellAutoWrapStringRenderer()
+        #r = gridlib.GridCellAutoWrapStringRenderer()
         #self.SetCellRenderer(9, 1, r)
 
         # overflow cells
@@ -83,7 +72,11 @@ class SimpleGrid(gridlib.Grid): ##, mixins.GridAutoEditMixin):
         self.SetCellEditor(0, 4, editor)
         self.SetCellValue(0, 4, "Limited text")
 
+        renderer = gridlib.GridCellAutoWrapStringRenderer()
+        self.SetCellRenderer(15,0, renderer)
+        self.SetCellValue(15,0, "The text in this cell will be rendered with word-wrapping")
 
+        
         # test all the events
         self.Bind(gridlib.EVT_GRID_CELL_LEFT_CLICK, self.OnCellLeftClick)
         self.Bind(gridlib.EVT_GRID_CELL_RIGHT_CLICK, self.OnCellRightClick)
@@ -241,7 +234,7 @@ class SimpleGrid(gridlib.Grid): ##, mixins.GridAutoEditMixin):
 class TestFrame(wx.Frame):
     def __init__(self, parent, log):
         wx.Frame.__init__(self, parent, -1, "Simple Grid Demo", size=(640,480))
-        grid = SimpleGrid(self, log)
+        self.grid = SimpleGrid(self, log)
 
 
 
@@ -252,6 +245,9 @@ if __name__ == '__main__':
     app = wx.PySimpleApp()
     frame = TestFrame(None, sys.stdout)
     frame.Show(True)
+    #import wx.py
+    #shell = wx.py.shell.ShellFrame(frame, locals={'wx':wx, 'frame':frame})
+    #shell.Show()
     app.MainLoop()