Patches from Tomo

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

diff --git a/wxPython/demo/CalendarCtrl.py b/wxPython/demo/CalendarCtrl.py
index f8e5ba78c1bf724f1bc21a8a9df15db235e70fe4..b91e8f8d3e3d41614b3791c0e2bfb56176a130bb 100644 (file)
--- a/wxPython/demo/CalendarCtrl.py
+++ b/wxPython/demo/CalendarCtrl.py
@@ -27,8 +27,9 @@ class TestPanel(wx.Panel):
         self.OnChangeMonth()
 
     def OnButton(self, evt):
         self.OnChangeMonth()
 
     def OnButton(self, evt):

-        self.cal.Destroy()
-        self.cal = None
+        if self.cal is not None:
+            self.cal.Destroy()
+            self.cal = None

 
     def OnCalSelected(self, evt):
         self.log.write('OnCalSelected: %s\n' % evt.GetDate())
 
     def OnCalSelected(self, evt):
         self.log.write('OnCalSelected: %s\n' % evt.GetDate())

diff --git a/wxPython/demo/Sizers.py b/wxPython/demo/Sizers.py
index f7e168aee931c5b1016c3f1350cdd5a2d33cd3ca..ef222514f71a74d27e90bfc77c20ba9aef59bc49 100644 (file)
--- a/wxPython/demo/Sizers.py
+++ b/wxPython/demo/Sizers.py
@@ -98,8 +98,8 @@ def makeSimpleBox7(win):
 #----------------------------------------------------------------------
 
 def makeSimpleBox8(win):
 #----------------------------------------------------------------------
 
 def makeSimpleBox8(win):

-    box = wxBoxSizer(wx.VERTICAL)
-    box.Add(wxButton(win, 1010, "one"), 0, wx.EXPAND)
+    box = wx.BoxSizer(wx.VERTICAL)
+    box.Add(wx.Button(win, 1010, "one"), 0, wx.EXPAND)

     box.Add((0,0), 1)
     box.Add(wx.Button(win, 1010, "two"), 0, wx.ALIGN_CENTER)
     box.Add((0,0), 1)
     box.Add((0,0), 1)
     box.Add(wx.Button(win, 1010, "two"), 0, wx.ALIGN_CENTER)
     box.Add((0,0), 1)


@@ -271,7 +271,7 @@ def makeGrid3(win):
                  (wx.Button(win, -1, 'two'),   0, wx.EXPAND),
                  (wx.Button(win, -1, 'three'), 0, wx.EXPAND),
                  (wx.Button(win, -1, 'four'),  0, wx.EXPAND),
                  (wx.Button(win, -1, 'two'),   0, wx.EXPAND),
                  (wx.Button(win, -1, 'three'), 0, wx.EXPAND),
                  (wx.Button(win, -1, 'four'),  0, wx.EXPAND),

-                 #(wxButton(win, 1010, 'five'),  0, wxEXPAND),
+                 #(wx.Button(win, 1010, 'five'),  0, wx.EXPAND),

                  ((175, 50)),
                  (wx.Button(win, -1, 'six'),   0, wx.EXPAND),
                  (wx.Button(win, -1, 'seven'), 0, wx.EXPAND),
                  ((175, 50)),
                  (wx.Button(win, -1, 'six'),   0, wx.EXPAND),
                  (wx.Button(win, -1, 'seven'), 0, wx.EXPAND),


@@ -440,14 +440,14 @@ theTests = [
     ("", None, ""),
 
     ("Simple Grid", makeGrid1,
     ("", None, ""),
 
     ("Simple Grid", makeGrid1,

-     "This is an example of the wxGridSizer.  In this case all row heights "
+     "This is an example of the wx.GridSizer.  In this case all row heights "

      "and column widths are kept the same as all the others and all items "
      "fill their available space.  The horizontal and vertical gaps are set to "
      "2 pixels each."
      ),
 
     ("More Grid Features", makeGrid2,
      "and column widths are kept the same as all the others and all items "
      "fill their available space.  The horizontal and vertical gaps are set to "
      "2 pixels each."
      ),
 
     ("More Grid Features", makeGrid2,

-     "This is another example of the wxGridSizer.  This one has no gaps in the grid, "
+     "This is another example of the wx.GridSizer.  This one has no gaps in the grid, "

      "but various cells are given different alignment options and some of them "
      "hold nested sizers."
      ),
      "but various cells are given different alignment options and some of them "
      "hold nested sizers."
      ),


@@ -469,7 +469,7 @@ theTests = [
 
     ("Proportional resize", makeSimpleBoxShaped,
      "Managed items can preserve their original aspect ratio.  The last item has the "
 
     ("Proportional resize", makeSimpleBoxShaped,
      "Managed items can preserve their original aspect ratio.  The last item has the "

-     "wxSHAPED flag set and will resize proportional to its original size."
+     "wx.SHAPED flag set and will resize proportional to its original size."

      ),
 
     ("Proportional resize with Alignments", makeShapes,
      ),
 
     ("Proportional resize with Alignments", makeShapes,


@@ -553,9 +553,6 @@ def runTest(frame, nb, log):
     return win
 
 overview = ""
     return win
 
 overview = ""

-#wxSizer.__doc__        + '\n' + '-' * 80 + '\n' + \
-#wxBoxSizer.__doc__     + '\n' + '-' * 80 + '\n' + \
-#wxBorderSizer.__doc__

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index 5b2a425053dcd8e7fd4322a4fbd635133b6bcc99..c7666ef8165dcfa9307e3be3b9bc1b35a6a183a5 100644 (file)
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -67,7 +67,7 @@ class TestValueWindow(gizmos.TreeCompanionWindow):
 
             text = text + tree.GetItemText(itemId)
             pen = wx.Pen(
 
             text = text + tree.GetItemText(itemId)
             pen = wx.Pen(

-                wx.SystemSettings_GetSystemColour(wx.SYS_COLOUR_3DLIGHT), 
+                wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DLIGHT), 

                 1, wx.SOLID
                 )
 
                 1, wx.SOLID
                 )
 


@@ -97,11 +97,11 @@ class TestPanel(wx.Panel):
             )
             
         splitter.SetSashSize(2)
             )
             
         splitter.SetSashSize(2)

-        tree = TestTree(splitter, -1, style = wx.TR_HAS_BUTTONS |
-                                              wx.TR_NO_LINES |
-                                              wx.TR_ROW_LINES |
-                                              #wx.TR_HIDE_ROOT |
-                                              wx.NO_BORDER )
+        tree = TestTree(splitter, style = wx.TR_HAS_BUTTONS |
+                                          wx.TR_NO_LINES |
+                                          wx.TR_ROW_LINES |
+                                          #wx.TR_HIDE_ROOT |
+                                          wx.NO_BORDER )

 
         valueWindow = TestValueWindow(splitter, style=wx.NO_BORDER)
 
 
         valueWindow = TestValueWindow(splitter, style=wx.NO_BORDER)