diff --git a/wxPython/demo/SplitTree.py b/wxPython/demo/SplitTree.py
index fddd44f7dc..3fd36f27a2 100644
--- a/wxPython/demo/SplitTree.py
+++ b/wxPython/demo/SplitTree.py
@@ -93,6 +93,10 @@ class TestPanel(wxPanel):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
+    if wxPlatform == "__WXMAC__":
+        wxMessageBox("This demo currently fails on the Mac. The problem is being looked into...", "Sorry")
+        return
+
     win = TestPanel(nb, log)
     return win
 
diff --git a/wxPython/demo/Throbber.py b/wxPython/demo/Throbber.py
index b9424b0d40..b80c776235 100644
--- a/wxPython/demo/Throbber.py
+++ b/wxPython/demo/Throbber.py
@@ -35,7 +35,7 @@ class TestPanel(wxPanel):
                   if i not in ['eclouds', 'logo']]
 
         self.throbbers['plain']['throbber'] = Throbber(self, -1,
-                                                       images, #size=(36, 36),
+                                                       images, size=(36, 36),
                                                        frameDelay = 0.1)
         self.throbbers['reverse']['throbber'] = Throbber(self, -1, images, #size=(36, 36),
                                                          frameDelay = 0.07)
@@ -79,8 +79,7 @@ class TestPanel(wxPanel):
 
         EVT_LEFT_DOWN(self.otherThrobber, self.OnClickThrobber)
 
-        staticBox = wxStaticBox(self, -1, "")
-        box = wxStaticBoxSizer(staticBox)
+        box = wxBoxSizer(wxVERTICAL)
         sizer = RowColSizer()
         box.Add(sizer, 1, wxEXPAND|wxALL, 5)
         sizer.AddGrowableCol(1)
@@ -150,8 +149,13 @@ class TestPanel(wxPanel):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    win = TestPanel(nb, log)
-    return win
+    if wxPlatform == "__WXMAC__":
+        wxMessageBox("This demo currently fails on the Mac, I think because of the lack of EVT_WINDOW_DESTROY...",
+                     "Sorry")
+        return
+    else:
+        win = TestPanel(nb, log)
+        return win
 
 #----------------------------------------------------------------------
 
diff --git a/wxPython/demo/wxDynamicSashWindow.py b/wxPython/demo/wxDynamicSashWindow.py
index dd9652791d..9c9d1fa5b7 100644
--- a/wxPython/demo/wxDynamicSashWindow.py
+++ b/wxPython/demo/wxDynamicSashWindow.py
@@ -89,6 +89,10 @@ class SimpleView(wxPanel):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
+    if wxPlatform == "__WXMAC__":
+        wxMessageBox("This demo currently fails on the Mac. The problem is being looked into...", "Sorry")
+        return
+
     if 1:
         win = wxDynamicSashWindow(nb, -1, style = 0
                                   | wxCLIP_CHILDREN
@@ -149,3 +153,10 @@ You will need to set the scrollbars' event handler at three times:
 </ul>
 </body></html>
 """
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+
diff --git a/wxPython/demo/wxValidator.py b/wxPython/demo/wxValidator.py
index 91192b2b80..3e997e4a74 100644
--- a/wxPython/demo/wxValidator.py
+++ b/wxPython/demo/wxValidator.py
@@ -203,6 +203,10 @@ class TestValidateDialog(wxDialog):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
+    if wxPlatform == "__WXMAC__":
+        wxMessageBox("This demo currently fails on the Mac. The problem is being looked into...", "Sorry")
+        return
+
     win = TestValidatorPanel(nb)
     return win
 
@@ -210,12 +214,6 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
-
-
-
 overview = """\
 wxValidator is the base class for a family of validator classes that mediate between a class of control, and application data.
 
@@ -230,3 +228,11 @@ A validator has three major roles:
 Validators can be plugged into controls dynamically.
 
 """
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+
diff --git a/wxPython/wxPython/lib/filebrowsebutton.py b/wxPython/wxPython/lib/filebrowsebutton.py
index 0ddc2818c6..5a5b35d62c 100644
--- a/wxPython/wxPython/lib/filebrowsebutton.py
+++ b/wxPython/wxPython/lib/filebrowsebutton.py
@@ -99,7 +99,7 @@ class FileBrowseButton(wxPanel):
         box.Add( self.textControl, 1, wxLEFT|wxCENTER, 5)
 
         self.browseButton = self.createBrowseButton()
-        box.Add( self.browseButton, 0, wxCENTER)
+        box.Add( self.browseButton, 0, wxLEFT|wxCENTER, 5)
 
         # add a border around the whole thing and resize the panel to fit
         outsidebox = wxBoxSizer(wxVERTICAL)