some little demo tweaks

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

diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index 3052a26538a41b3717f56a98012dca62fef51460..e3a1d16d933946470165faa79a347f8f2fbf40e2 100644 (file)
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -71,7 +71,6 @@ class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin):
         EVT_GRID_EDITOR_CREATED(self, self.OnEditorCreated)
 
 
         EVT_GRID_EDITOR_CREATED(self, self.OnEditorCreated)
 
 

-

     def OnCellLeftClick(self, evt):
         self.log.write("OnCellLeftClick: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))
     def OnCellLeftClick(self, evt):
         self.log.write("OnCellLeftClick: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 5eebb3513788902b349d5d24fe2e4120aff4273e..3f0e2d32362988b9f76ba43598fe8fca4d395f2a 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -119,7 +119,7 @@ class wxPythonDemo(wxFrame):
         EVT_ERASE_BACKGROUND(splitter, EmptyHandler)
         EVT_ERASE_BACKGROUND(splitter2, EmptyHandler)
 
         EVT_ERASE_BACKGROUND(splitter, EmptyHandler)
         EVT_ERASE_BACKGROUND(splitter2, EmptyHandler)
 

-        # Prevent TreeCtrl from displaying all items after destruction
+        # Prevent TreeCtrl from displaying all items after destruction when true

         self.dying = false
 
         # Make a File menu
         self.dying = false
 
         # Make a File menu

diff --git a/wxPython/demo/PyCrustWithFilling.py b/wxPython/demo/PyCrustWithFilling.py
index 78a200a9d685b223f1d350d6c75dbdd7b0dfd760..cc47586cd78616a284d63b98e6ae03c2db6198f3 100644 (file)
--- a/wxPython/demo/PyCrustWithFilling.py
+++ b/wxPython/demo/PyCrustWithFilling.py
@@ -11,7 +11,8 @@ def runTest(frame, nb, log):
     win = wxSplitterWindow(nb, -1, size=(640, 480))
     shellWin = shell.Shell(win, -1, introText=intro)
     fillingWin = filling.Filling(win, -1, size=(640, 480),
     win = wxSplitterWindow(nb, -1, size=(640, 480))
     shellWin = shell.Shell(win, -1, introText=intro)
     fillingWin = filling.Filling(win, -1, size=(640, 480),

-                                 ingredients=shellWin.interp.locals)
+                                 rootObject=shellWin.interp.locals
+                                 )

     win.SplitHorizontally(shellWin, fillingWin)
     return win
 
     win.SplitHorizontally(shellWin, fillingWin)
     return win
 

diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index f5fad6d8ed8c4b766f41b3bc819ed72bf05e92d3..a97cf24a3f4fa3fa6fb8a93545fac468b1f641d5 100644 (file)
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -56,6 +56,21 @@ musicdata = {
 37: ("Spyro Gyra", "Song for Lorraine", "Jazz"),
 38: ("Yes", "Owner Of A Lonely Heart", "Rock"),
 39: ("Yes", "Rhythm Of Love", "Rock"),
 37: ("Spyro Gyra", "Song for Lorraine", "Jazz"),
 38: ("Yes", "Owner Of A Lonely Heart", "Rock"),
 39: ("Yes", "Rhythm Of Love", "Rock"),

+40: ("Cusco", "Dream Catcher", "New Age"),
+41: ("Cusco", "Geronimos Laughter", "New Age"),
+42: ("Cusco", "Ghost Dance", "New Age"),
+43: ("Blue Man Group", "Drumbone", "New Age"),
+44: ("Blue Man Group", "Endless Column", "New Age"),
+45: ("Blue Man Group", "Klein Mandelbrot", "New Age"),
+46: ("Kenny G", "Silhouette", "Jazz"),
+47: ("Sade", "Smooth Operator", "Jazz"),
+48: ("David Arkenstone", "Papillon (On The Wings Of The Butterfly)", "New Age"),
+49: ("David Arkenstone", "Stepping Stars", "New Age"),
+50: ("David Arkenstone", "Carnation Lily Lily Rose", "New Age"),
+51: ("David Lanz", "Behind The Waterfall", "New Age"),
+52: ("David Lanz", "Cristofori's Dream", "New Age"),
+53: ("David Lanz", "Heartsounds", "New Age"),
+54: ("David Lanz", "Leaves on the Seine", "New Age"),

 }
 
 import images
 }
 
 import images


@@ -170,6 +185,7 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         self.x = event.GetX()
         self.y = event.GetY()
         self.log.WriteText("x, y = %s\n" % str((self.x, self.y)))
         self.x = event.GetX()
         self.y = event.GetY()
         self.log.WriteText("x, y = %s\n" % str((self.x, self.y)))

+        print event.GetEventObject()

         event.Skip()
 
 
         event.Skip()