Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as

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

index f0cf3db96686d6b97ae3d4cbf6a3bf42486fe3f1..f7d3ef4df3237dfc91dd30528d5a310f0a87d48b 100644 (file)
--- a/wxPython/demo/ActiveX_FlashWindow.py
+++ b/wxPython/demo/ActiveX_FlashWindow.py
@@ -29,7 +29,7 @@ class TestPanel(wx.Panel):
          self.Bind(wx.EVT_BUTTON, self.OnOpenURLButton, btn)
          btnSizer.Add(btn, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
  
-         btnSizer.Add((50,-1), proportion=2, flag=wx.EXPAND)
+        btnSizer.Add((50,-1), proportion=2, flag=wx.EXPAND)
          sizer.Add(btnSizer, proportion=0, flag=wx.EXPAND)
  
          self.SetSizer(sizer)
@@ -68,14 +68,15 @@ def runTest(frame, nb, log):
          win = TestPanel(nb, log)
          return win
      else:
-        dlg = wx.MessageDialog(frame, 'This demo only works on MSW.',
-                          'Sorry', wx.OK | wx.ICON_INFORMATION)
-        dlg.ShowModal()
-        dlg.Destroy()
+        from Main import MessagePanel
+        win = MessagePanel(nb, 'This demo only works on Microsoft Windows.',
+                           'Sorry', wx.ICON_WARNING)
+        return win
  
  
-overview = """\<html><body>
-<h2>wx.lib.pdfwin.FlashWindow</h2>
+overview = """\
+<html><body>
+<h2>wx.lib.flashwin.FlashWindow</h2>
  
  The wx.lib.pdfwin.FlashWindow class is yet another example of using
  ActiveX controls from wxPython using the new wx.activex module.  This
@@ -87,7 +88,7 @@ ActiveX control in a very intuitive way.
  the win32all extensions, and is more "wx\'ish", meaning that it uses
  events and etc. as would be expected from any other wx window.
  
-<p> This demo embeds the Shackwave Flash control, and lets you play a game.
+<p> This demo embeds the Shockwave Flash control, and lets you play a game.
  
  </body></html>
  """