From 0af45411b9d08118f2a599427de2092c3f7972f2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 15 May 2002 05:05:02 +0000 Subject: [PATCH] demo updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/demo/PyCrust.py | 6 ++++++ wxPython/demo/run.py | 3 ++- wxPython/demo/wxScrolledWindow.py | 10 +++++----- wxPython/demo/wxStyledTextCtrl_1.py | 18 +++++++++++------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/wxPython/demo/PyCrust.py b/wxPython/demo/PyCrust.py index 3c7884151f..feaf9df92e 100644 --- a/wxPython/demo/PyCrust.py +++ b/wxPython/demo/PyCrust.py @@ -14,3 +14,9 @@ def runTest(frame, nb, log): #---------------------------------------------------------------------- overview = shell.__doc__ + + +if __name__ == '__main__': + import run + run.main(['', 'PyCrust']) + diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py index 09cc9488dd..d2eac71dae 100755 --- a/wxPython/demo/run.py +++ b/wxPython/demo/run.py @@ -33,7 +33,8 @@ class RunDemoApp(wxApp): def __init__(self, name, module): self.name = name self.demoModule = module - wxApp.__init__(self, 0) + wxApp.__init__(self, wxPlatform == "__WXMAC__") + def OnInit(self): wxInitAllImageHandlers() diff --git a/wxPython/demo/wxScrolledWindow.py b/wxPython/demo/wxScrolledWindow.py index ad1fa7beca..31a388a11e 100644 --- a/wxPython/demo/wxScrolledWindow.py +++ b/wxPython/demo/wxScrolledWindow.py @@ -19,11 +19,6 @@ class MyCanvas(wxScrolledWindow): self.drawing = false self.SetBackgroundColour("WHITE") - 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) @@ -40,6 +35,11 @@ class MyCanvas(wxScrolledWindow): dc.Clear() self.DoDrawing(dc) + EVT_LEFT_DOWN(self, self.OnLeftButtonEvent) + EVT_LEFT_UP(self, self.OnLeftButtonEvent) + EVT_MOTION(self, self.OnLeftButtonEvent) + EVT_PAINT(self, self.OnPaint) + def getWidth(self): return self.maxWidth diff --git a/wxPython/demo/wxStyledTextCtrl_1.py b/wxPython/demo/wxStyledTextCtrl_1.py index ed9a403f72..4cbdddfecb 100644 --- a/wxPython/demo/wxStyledTextCtrl_1.py +++ b/wxPython/demo/wxStyledTextCtrl_1.py @@ -264,12 +264,16 @@ be helpful. -if __name__ == '__main__': - import sys - app = wxPySimpleApp() - frame = wxFrame(None, -1, "Tester...", size=(640, 480)) - win = runTest(frame, frame, sys.stdout) - frame.Show(true) - app.MainLoop() +## if __name__ == '__main__': +## import sys +## app = wxPySimpleApp() +## frame = wxFrame(None, -1, "Tester...", size=(640, 480)) +## win = runTest(frame, frame, sys.stdout) +## frame.Show(true) +## app.MainLoop() + +if __name__ == '__main__': + import run + run.main(['', 'wxStyledTextCtrl_1']) -- 2.47.2