Some demo tweaks

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 05b92777aabd29388502a9adc43b982e1e575d54..ffdb8be6d95634be64b527663f039a89c6c59acd 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -122,9 +122,9 @@ _treeList = [
         'wxLEDNumberCtrl',
         'wxMimeTypesManager',
         'wxMVCTree',
         'wxLEDNumberCtrl',
         'wxMimeTypesManager',
         'wxMVCTree',

+        'wxRightTextCtrl',

         'wxStyledTextCtrl_1',
         'wxStyledTextCtrl_2',
         'wxStyledTextCtrl_1',
         'wxStyledTextCtrl_2',

-        'wxRightTextCtrl',

         ]),
 
     # How to lay out the controls in a frame/dialog
         ]),
 
     # How to lay out the controls in a frame/dialog


@@ -186,7 +186,7 @@ _treeList = [
         'wxPlotCanvas',
         ]),
 
         'wxPlotCanvas',
         ]),
 

-    # pyTree, hangman, ... in the samples dir
+

     ('Check out the samples dir too', [
         ]),
 
     ('Check out the samples dir too', [
         ]),
 

diff --git a/wxPython/demo/wxDragImage.py b/wxPython/demo/wxDragImage.py
index 1c99d25f1d1f8147b030b2c8ce4a9b632186eb83..7ab24df8b9107650e9da5cde04498bdadebef7b6 100644 (file)
--- a/wxPython/demo/wxDragImage.py
+++ b/wxPython/demo/wxDragImage.py
@@ -262,7 +262,10 @@ class DragCanvas(wxScrolledWindow):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    win = DragCanvas(nb, -1)
+    win = wxPanel(nb, -1)
+    canvas = DragCanvas(win, -1)
+    def onSize(evt, panel=win, canvas=canvas): canvas.SetSize(panel.GetSize())
+    EVT_SIZE(win, onSize)

     return win
 
 #----------------------------------------------------------------------
     return win
 
 #----------------------------------------------------------------------

diff --git a/wxPython/demo/wxFloatBar.py b/wxPython/demo/wxFloatBar.py
index 5a7afb92eb8d1a8793e21776a8b80704fa4e5704..593e3b0ab8d3ffc1f5b2fc4354ea038ab112510b 100644 (file)
--- a/wxPython/demo/wxFloatBar.py
+++ b/wxPython/demo/wxFloatBar.py
@@ -21,27 +21,27 @@ class TestFloatBar(wxFrame):
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
 
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
 

-        tb.AddSimpleTool(10, '', images.getNewBitmap(), "New", "Long help for 'New'")
+        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")

         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 

-        tb.AddSimpleTool(20, '', images.getOpenBitmap(), "Open")
+        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open")

         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()
         EVT_TOOL(self, 20, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
 
         tb.AddSeparator()

-        tb.AddSimpleTool(30, '', images.getCopyBitmap(), "Copy")
+        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy")

         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 
         EVT_TOOL(self, 30, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
 

-        tb.AddSimpleTool(40, '', images.getPasteBitmap(), "Paste")
+        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste")

         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 
 
         EVT_TOOL(self, 40, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
 
         tb.AddSeparator()
 
 

-        tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap())
+        tb.AddCheckTool(60, images.getTog1Bitmap(), images.getTog2Bitmap())

         EVT_TOOL(self, 60, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
         tb.Realize()
         EVT_TOOL(self, 60, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
         tb.Realize()