Various layout fixes and such

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

diff --git a/wxPython/demo/CheckListBox.py b/wxPython/demo/CheckListBox.py
index 72a0d66ab39b7ece71fefb6494e81ae14786d61f..bfc4d40a439e837c849bce007b7a4615ad22c801 100644 (file)
--- a/wxPython/demo/CheckListBox.py
+++ b/wxPython/demo/CheckListBox.py
@@ -14,7 +14,7 @@ class TestPanel(wx.Panel):
 
         wx.StaticText(self, -1, "This example uses the wxCheckListBox control.", (45, 15))
 
-        lb = wx.CheckListBox(self, -1, (80, 50), (80, 120), sampleList)
+        lb = wx.CheckListBox(self, -1, (80, 50), wx.DefaultSize, sampleList)
         self.Bind(wx.EVT_LISTBOX, self.EvtListBox, lb)
         self.Bind(wx.EVT_LISTBOX_DCLICK, self.EvtListBoxDClick, lb)
         lb.SetSelection(0)

diff --git a/wxPython/demo/Choice.py b/wxPython/demo/Choice.py
index 35b02b312abdb09decb15afa2017cacbbdbc7add..2c84c7a1908846353c2764d68388a768ac9fef92 100644 (file)
--- a/wxPython/demo/Choice.py
+++ b/wxPython/demo/Choice.py
@@ -13,7 +13,7 @@ class TestChoice(wx.Panel):
 
         wx.StaticText(self, -1, "This example uses the wxChoice control.", (15, 10))
         wx.StaticText(self, -1, "Select one:", (15, 50), (75, 20))
-        self.ch = wx.Choice(self, -1, (80, 50), choices = sampleList)
+        self.ch = wx.Choice(self, -1, (90, 50), choices = sampleList)
         self.Bind(wx.EVT_CHOICE, self.EvtChoice, self.ch)
 
 

diff --git a/wxPython/demo/PopupControl.py b/wxPython/demo/PopupControl.py
index d96e1ec7d466070401e7164d2db8f950f1b865c2..6f3bf1289414edd6da8160e573b96e44a59b45e4 100644 (file)
--- a/wxPython/demo/PopupControl.py
+++ b/wxPython/demo/PopupControl.py
@@ -68,8 +68,13 @@ class TestPanel(wx.Panel):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    win = TestPanel(nb, log)
-    return win
+    if wx.Platform == "__WXMAC__":
+        wx.MessageBox("This demo currently fails on the Mac.",
+                     "Sorry")
+        return
+    else:
+        win = TestPanel(nb, log)
+        return win
 
 #----------------------------------------------------------------------
 

diff --git a/wxPython/demo/SpinButton.py b/wxPython/demo/SpinButton.py
index 4366d3c9d88518ba854486bbf11deaf789e67a03..f56f8048326e74f91272ce138cb42b8cf864cbbf 100644 (file)
--- a/wxPython/demo/SpinButton.py
+++ b/wxPython/demo/SpinButton.py
@@ -17,8 +17,9 @@ class TestPanel(wx.Panel):
 
         self.text = wx.TextCtrl(self, -1, "1", (30, 50), (60, -1))
         h = self.text.GetSize().height
+        w = self.text.GetSize().width + self.text.GetPosition().x
 
-        self.spin = wx.SpinButton(self, -1, (92, 50), (h/2, h), wx.SP_VERTICAL)
+        self.spin = wx.SpinButton(self, -1, (w + 6, 50), (h/2, h), wx.SP_VERTICAL)
         self.spin.SetRange(1, 100)
         self.spin.SetValue(1)
 

diff --git a/wxPython/demo/SpinCtrl.py b/wxPython/demo/SpinCtrl.py
index 23d20cb31f7ed75eaf708562bc2c54e22f6b0e24..327bc1744196705601fbc0db687a89d0df179518 100644 (file)
--- a/wxPython/demo/SpinCtrl.py
+++ b/wxPython/demo/SpinCtrl.py
@@ -10,7 +10,7 @@ class TestPanel(wx.Panel):
         self.count = 0
 
         wx.StaticText(self, -1, "This example uses the wx.SpinCtrl control.", (45, 15))
-        sc = wx.SpinCtrl(self, -1, "", (30, 50), (80, -1))
+        sc = wx.SpinCtrl(self, -1, "", (30, 50))
         sc.SetRange(1,100)
         sc.SetValue(5)