From: Robin Dunn Date: Sun, 29 Jan 2006 02:34:44 +0000 (+0000) Subject: Minor demo tweaks X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/59c24dcbf6e4c386921b6afe35fea57a2adadcc6 Minor demo tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/demo/GetMouseState.py b/wxPython/demo/GetMouseState.py index c010c073dc..f51a8741ff 100644 --- a/wxPython/demo/GetMouseState.py +++ b/wxPython/demo/GetMouseState.py @@ -110,6 +110,10 @@ class TestPanel(wx.Panel): self.cmd.SetLabel( str(ms.cmdDown) ) + def ShutdownDemo(self): + self.timer.Stop() + del self.timer + #---------------------------------------------------------------------- def runTest(frame, nb, log): diff --git a/wxPython/demo/KeyEvents.py b/wxPython/demo/KeyEvents.py index 71acdf2294..1b55200099 100644 --- a/wxPython/demo/KeyEvents.py +++ b/wxPython/demo/KeyEvents.py @@ -231,6 +231,8 @@ class KeyLog(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin): if keycode <= 127: keycode = evt.GetKeyCode() keyname = "\"" + unichr(evt.GetUnicodeKey()) + "\"" + if keycode < 27: + keyname = "Ctrl-%s" % chr(ord('A') + keycode-1) elif keycode < 256: if keycode == 0: diff --git a/wxPython/demo/PyPlot.py b/wxPython/demo/PyPlot.py index f916dc6615..52387c5044 100644 --- a/wxPython/demo/PyPlot.py +++ b/wxPython/demo/PyPlot.py @@ -1,6 +1,12 @@ import wx -import wx.lib.plot + +hadImportError = False +try: + import wx.lib.plot +except ImportError: + hadImportError = True + ################################################################\ # Where's the code??? | @@ -32,13 +38,27 @@ class TestPanel(wx.Panel): def runTest(frame, nb, log): - win = TestPanel(nb, log) + if not hadImportError: + win = TestPanel(nb, log) + else: + from Main import MessagePanel + win = MessagePanel(nb, """\ +This demo requires the Numeric or numarray module, +which could not be imported. It probably is not installed +(it's not part of the standard Python distribution). See the +Python site (http://www.python.org) for information on +downloading source or binaries.""", + 'Sorry', wx.ICON_WARNING) + return win #---------------------------------------------------------------------- -overview = """\ +if hadImportError: + overview = "" +else: + overview = """\