From a3015b16ddf12695487a61776b036abe592fba4d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 20 Nov 2001 02:31:27 +0000 Subject: [PATCH] Demo updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/simple.py | 5 ++++- wxPython/demo/wxScrolledWindow.py | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wxPython/demo/simple.py b/wxPython/demo/simple.py index 3e745d419e..d73680348c 100644 --- a/wxPython/demo/simple.py +++ b/wxPython/demo/simple.py @@ -19,7 +19,10 @@ class MyFrame(wxFrame): 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") diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index bb679ceb44..5272098130 100644 --- 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_PAINT(self, self.OnPaint) - 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) + def getWidth(self): return self.maxWidth -- 2.47.2