A few little tweaks

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 2fde4eadc1fe82f0025b5bb61fdd2e52ad9c018b..15b039e16057de8b51adc4441a29eaeb63c1e228 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -450,15 +450,15 @@ class wxPythonDemo(wxFrame):
                     self.SetOverview(itemText + " Overview", module.overview)
                 finally:
                     wxEndBusyCursor()
                     self.SetOverview(itemText + " Overview", module.overview)
                 finally:
                     wxEndBusyCursor()

+                self.tree.Refresh()

 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();
 
                 # in case runTest is modal, make sure things look right...
                 self.nb.Refresh();

-                wxYield()
+                wxSafeYield()

 
                 self.window = module.runTest(self, self.nb, self) ###
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')
 
                 self.window = module.runTest(self, self.nb, self) ###
                 if self.window:
                     self.nb.AddPage(self.window, 'Demo')

-                    #wxYield()  TODO: Is this still needed?

                     self.nb.SetSelection(2)
                     self.nb.Refresh()  # without this wxMac has troubles showing the just added page
 
                     self.nb.SetSelection(2)
                     self.nb.Refresh()  # without this wxMac has troubles showing the just added page
 

diff --git a/wxPython/demo/wxButton.py b/wxPython/demo/wxButton.py
index 2c763d7f70b4178a7a4856c115cb7df4b5509880..a02cc6f5ab422f420d842b9591fbebb335017307 100644 (file)
--- a/wxPython/demo/wxButton.py
+++ b/wxPython/demo/wxButton.py
@@ -16,7 +16,7 @@ class TestPanel(wxPanel):
         b.SetForegroundColour(wxWHITE)
         b.SetDefault()
 
         b.SetForegroundColour(wxWHITE)
         b.SetDefault()
 

-        b = wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))
+        b = wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(120, 45))

         EVT_BUTTON(self, 20, self.OnClick)
 
         b.SetToolTipString("This is a Hello button...")
         EVT_BUTTON(self, 20, self.OnClick)
 
         b.SetToolTipString("This is a Hello button...")


@@ -25,7 +25,7 @@ class TestPanel(wxPanel):
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
 
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
 

-        wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
+        wxBitmapButton(self, 30, bmp, wxPoint(160, 20),

                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)
 
                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)