Another package name fix

[wxWidgets.git] / wxPython / demo / run.py

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index f4bb659daaf7017786322b22cafeebb75109ae84..3c27661e9ed49357c2b1dbdfd2f1278d4e367e30 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -21,7 +21,7 @@ import wx                  # This module uses the new wx namespace
 import sys, os
 
 # stuff for debugging
 import sys, os
 
 # stuff for debugging

-print "wx.VERSION_STRING = ", wx.VERSION_STRING
+print "wx.version:", wx.version()

 print "pid:", os.getpid()
 ##raw_input("Press Enter...")
 
 print "pid:", os.getpid()
 ##raw_input("Press Enter...")
 


@@ -58,8 +58,8 @@ class RunDemoApp(wx.App):
 
         menuBar = wx.MenuBar()
         menu = wx.Menu()
 
         menuBar = wx.MenuBar()
         menu = wx.Menu()

-        item = menu.Append(-1, "E&xit\tAlt-X", "Exit demo")
-        self.Bind(wx.EVT_MENU, self.OnButton, item)
+        item = menu.Append(-1, "E&xit\tCtrl-Q", "Exit demo")
+        self.Bind(wx.EVT_MENU, self.OnExitApp, item)

         menuBar.Append(menu, "&File")
 
         ns = {}
         menuBar.Append(menu, "&File")
 
         ns = {}


@@ -85,20 +85,10 @@ class RunDemoApp(wx.App):
             frect = frame.GetRect()
 
         else:
             frect = frame.GetRect()
 
         else:

-            # otherwise the demo made its own frame, so just put a
-            # button in this one
-            if hasattr(frame, 'otherWin'):
-                ns['win'] = frame.otherWin
-                frect = frame.otherWin.GetRect()
-                p = wx.Panel(frame, -1)
-                b = wx.Button(p, -1, " Exit ", (10,10))
-                wx.CallAfter(frame.SetClientSize, (200, 100))
-                frame.Bind(wx.EVT_BUTTON, self.OnButton, b)
-            else:
-                # It was probably a dialog or something that is already
-                # gone, so we're done.
-                frame.Destroy()
-                return True
+            # It was probably a dialog or something that is already
+            # gone, so we're done.
+            frame.Destroy()
+            return True

 
         self.SetTopWindow(frame)
         self.frame = frame
 
         self.SetTopWindow(frame)
         self.frame = frame


@@ -125,7 +115,7 @@ class RunDemoApp(wx.App):
         return True
 
 
         return True
 
 

-    def OnButton(self, evt):
+    def OnExitApp(self, evt):

         self.frame.Close(True)
 
 
         self.frame.Close(True)