From 6ab5d4883f3b51e88ccdd3b59fb0e000b3b6ad0f Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 14 Jun 2004 19:10:20 +0000
Subject: [PATCH] Various layout fixes and such

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/demo/CheckListBox.py | 2 +-
 wxPython/demo/Choice.py       | 2 +-
 wxPython/demo/PopupControl.py | 9 +++++++--
 wxPython/demo/SpinButton.py   | 3 ++-
 wxPython/demo/SpinCtrl.py     | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/wxPython/demo/CheckListBox.py b/wxPython/demo/CheckListBox.py
index 72a0d66ab3..bfc4d40a43 100644
--- 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 35b02b312a..2c84c7a190 100644
--- 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 d96e1ec7d4..6f3bf12894 100644
--- 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 4366d3c9d8..f56f804832 100644
--- 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 23d20cb31f..327bc17441 100644
--- 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)
 
-- 
2.47.2