Minor demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -110,6 +110,10 @@ class TestPanel(wx.Panel):
|
|||||||
self.cmd.SetLabel( str(ms.cmdDown) )
|
self.cmd.SetLabel( str(ms.cmdDown) )
|
||||||
|
|
||||||
|
|
||||||
|
def ShutdownDemo(self):
|
||||||
|
self.timer.Stop()
|
||||||
|
del self.timer
|
||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
def runTest(frame, nb, log):
|
def runTest(frame, nb, log):
|
||||||
|
@@ -231,6 +231,8 @@ class KeyLog(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
|
|||||||
if keycode <= 127:
|
if keycode <= 127:
|
||||||
keycode = evt.GetKeyCode()
|
keycode = evt.GetKeyCode()
|
||||||
keyname = "\"" + unichr(evt.GetUnicodeKey()) + "\""
|
keyname = "\"" + unichr(evt.GetUnicodeKey()) + "\""
|
||||||
|
if keycode < 27:
|
||||||
|
keyname = "Ctrl-%s" % chr(ord('A') + keycode-1)
|
||||||
|
|
||||||
elif keycode < 256:
|
elif keycode < 256:
|
||||||
if keycode == 0:
|
if keycode == 0:
|
||||||
|
@@ -1,6 +1,12 @@
|
|||||||
|
|
||||||
import wx
|
import wx
|
||||||
import wx.lib.plot
|
|
||||||
|
hadImportError = False
|
||||||
|
try:
|
||||||
|
import wx.lib.plot
|
||||||
|
except ImportError:
|
||||||
|
hadImportError = True
|
||||||
|
|
||||||
|
|
||||||
################################################################\
|
################################################################\
|
||||||
# Where's the code??? |
|
# Where's the code??? |
|
||||||
@@ -32,13 +38,27 @@ class TestPanel(wx.Panel):
|
|||||||
|
|
||||||
|
|
||||||
def runTest(frame, nb, log):
|
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
|
return win
|
||||||
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
overview = """\
|
if hadImportError:
|
||||||
|
overview = ""
|
||||||
|
else:
|
||||||
|
overview = """\
|
||||||
<html><body>
|
<html><body>
|
||||||
<center><h2>PyPlot</h2></center>
|
<center><h2>PyPlot</h2></center>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user