Demo updates

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

diff --git a/wxPython/demo/simple.py b/wxPython/demo/simple.py
index 3e745d419e73deea58aa78f2c9edafdc1ae8e317..d73680348c063b1d24641f4889c974547eccaa83 100644 (file)
--- a/wxPython/demo/simple.py
+++ b/wxPython/demo/simple.py
@@ -19,7 +19,10 @@ class MyFrame(wxFrame):
         self.SetMenuBar(menuBar)
 
         panel = wxPanel(self, -1)
         self.SetMenuBar(menuBar)
 
         panel = wxPanel(self, -1)

-        text = wxStaticText(panel, -1, "Hello World!\nWhere is my menu?")
+        if wxPlatform == "__WXMAC__":
+            text = wxStaticText(panel, -1, "Hello World!\nWhere is my menu?")
+        else:
+            text = wxStaticText(panel, -1, "Hello World!")

         text.SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD))
         text.SetSize(text.GetBestSize())
         btn = wxButton(panel, -1, "Close")
         text.SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD))
         text.SetSize(text.GetBestSize())
         btn = wxButton(panel, -1, "Close")

diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py
index bb679ceb4475a42f55f788f629804db547dcb4fb..527209813077c80b46fb2d3e7643e18b6772747e 100644 (file)
--- a/wxPython/demo/wxScrolledWindow.py
+++ b/wxPython/demo/wxScrolledWindow.py
@@ -17,10 +17,8 @@ class MyCanvas(wxScrolledWindow):
         EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)
         EVT_LEFT_DOWN(self, self.OnLeftButtonEvent)
         EVT_LEFT_UP(self,   self.OnLeftButtonEvent)
         EVT_MOTION(self,    self.OnLeftButtonEvent)

-

         EVT_PAINT(self, self.OnPaint)
 
         EVT_PAINT(self, self.OnPaint)
 

-

         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = images.getTest2Bitmap()
         mask = wxMaskColour(bmp, wxBLUE)


@@ -29,6 +27,7 @@ class MyCanvas(wxScrolledWindow):
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
 
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
 

+

     def getWidth(self):
         return self.maxWidth
 
     def getWidth(self):
         return self.maxWidth