Simplify PCH support. Minor source cleaning.

[wxWidgets.git] / wxPython / demo / PyPlot.py
diff --git a/wxPython/demo/PyPlot.py b/wxPython/demo/PyPlot.py

index f916dc66155bff6110aba1dd468628b262f34836..52387c5044ef0daa860dc740d34c0826a1f05643 100644 (file)
--- a/wxPython/demo/PyPlot.py
+++ b/wxPython/demo/PyPlot.py
@@ -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>
  <center><h2>PyPlot</h2></center>
  
  <html><body>
  <center><h2>PyPlot</h2></center>