X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c38400d026f8f0f6d3f149d591b9a6a8dcbcff7c..51ba037fa8891066572ff367577770e234089dc0:/wxPython/demo/run.py?ds=sidebyside diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py index 99d76f5745..0e238b55fc 100755 --- a/wxPython/demo/run.py +++ b/wxPython/demo/run.py @@ -55,14 +55,16 @@ class RunDemoApp(wx.App): frame = wx.Frame(None, -1, "RunDemo: " + self.name, pos=(50,50), size=(200,100), style=wx.NO_FULL_REPAINT_ON_RESIZE|wx.DEFAULT_FRAME_STYLE) frame.CreateStatusBar() + menuBar = wx.MenuBar() menu = wx.Menu() - menu.Append(101, "E&xit\tAlt-X", "Exit demo") - wx.EVT_MENU(self, 101, self.OnButton) + item = menu.Append(-1, "E&xit\tAlt-X", "Exit demo") + self.Bind(wx.EVT_MENU, self.OnButton, item) menuBar.Append(menu, "&File") + frame.SetMenuBar(menuBar) frame.Show(True) - wx.EVT_CLOSE(frame, self.OnCloseFrame) + frame.Bind(wx.EVT_CLOSE, self.OnCloseFrame) win = self.demoModule.runTest(frame, frame, Log()) @@ -83,7 +85,7 @@ class RunDemoApp(wx.App): p.Fit() frame.SetClientSize(p.GetSize()) #frame.SetSize((200, 100)) - wx.EVT_BUTTON(frame, b.GetId(), self.OnButton) + frame.Bind(wx.EVT_BUTTON, self.OnButton, b) else: # It was probably a dialog or something that is already # gone, so we're done. @@ -115,9 +117,7 @@ def main(argv): print "Please specify a demo module name on the command-line" raise SystemExit - name = argv[1] - if name[-3:] == '.py': - name = name[:-3] + name, ext = os.path.splitext(argv[1]) module = __import__(name)