Added wrappers for the missing wxSpinEvent, which fixes the deadlock

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

diff --git a/wxPython/demo/Sizers.py b/wxPython/demo/Sizers.py
index 252a6357767228bcf69b66c2b3416b3e6660cff2..f7e168aee931c5b1016c3f1350cdd5a2d33cd3ca 100644 (file)
--- a/wxPython/demo/Sizers.py
+++ b/wxPython/demo/Sizers.py
@@ -1,8 +1,3 @@
-# 11/13/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# o Issues exist that will probably need to be addressed in the 2.5 build.
-#

 # 11/26/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
 # o Had to do a bit of rework for the demo; there was no panel attached
 # 11/26/2003 - Jeff Grimmett (grimmtooth@softhome.net)
 #
 # o Had to do a bit of rework for the demo; there was no panel attached


@@ -91,26 +86,26 @@ def makeSimpleBox6(win):
 #----------------------------------------------------------------------
 
 def makeSimpleBox7(win):
 #----------------------------------------------------------------------
 
 def makeSimpleBox7(win):

-    box = wxBoxSizer(wxHORIZONTAL)
-    box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
-    box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
-    box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
-    box.Add((60, 20), 0, wxEXPAND)
-    box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
+    box = wx.BoxSizer(wx.HORIZONTAL)
+    box.Add(wx.Button(win, 1010, "one"), 0, wx.EXPAND)
+    box.Add(wx.Button(win, 1010, "two"), 0, wx.EXPAND)
+    box.Add(wx.Button(win, 1010, "three"), 0, wx.EXPAND)
+    box.Add((60, 20), 0, wx.EXPAND)
+    box.Add(wx.Button(win, 1010, "five"), 1, wx.EXPAND)

 
     return box
 
 #----------------------------------------------------------------------
 
 def makeSimpleBox8(win):
 
     return box
 
 #----------------------------------------------------------------------
 
 def makeSimpleBox8(win):

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

     box.Add((0,0), 1)
     box.Add((0,0), 1)

-    box.Add(wxButton(win, 1010, "two"), 0, wxALIGN_CENTER)
+    box.Add(wx.Button(win, 1010, "two"), 0, wx.ALIGN_CENTER)

     box.Add((0,0), 1)
     box.Add((0,0), 1)

-    box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
-    box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
-#    box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
+    box.Add(wx.Button(win, 1010, "three"), 0, wx.EXPAND)
+    box.Add(wx.Button(win, 1010, "four"), 0, wx.EXPAND)
+#    box.Add(wx.Button(win, 1010, "five"), 1, wx.EXPAND)

 
     return box
 
 
     return box