[start of] a wxUniversal implementation of wxToolBar

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

diff --git a/wxPython/demo/run.py b/wxPython/demo/run.py
index c58a9a86f084439632bbaf9dc38caee47b968c1d..09cc9488dd899c5ea06cab7871c9512be35edc81 100755 (executable)
--- a/wxPython/demo/run.py
+++ b/wxPython/demo/run.py
@@ -18,7 +18,7 @@ on the command line.
 """
 
 
 """
 
 

-import sys
+import sys, os

 from wxPython.wx import *
 
 #----------------------------------------------------------------------------
 from wxPython.wx import *
 
 #----------------------------------------------------------------------------


@@ -40,6 +40,12 @@ class RunDemoApp(wxApp):
         frame = wxFrame(None, -1, "RunDemo: " + self.name, size=(0,0),
                         style=wxNO_FULL_REPAINT_ON_RESIZE|wxDEFAULT_FRAME_STYLE)
         frame.CreateStatusBar()
         frame = wxFrame(None, -1, "RunDemo: " + self.name, size=(0,0),
                         style=wxNO_FULL_REPAINT_ON_RESIZE|wxDEFAULT_FRAME_STYLE)
         frame.CreateStatusBar()

+        menuBar = wxMenuBar()
+        menu = wxMenu()
+        menu.Append(101, "E&xit\tAlt-X", "Exit demo")
+        EVT_MENU(self, 101, self.OnButton)
+        menuBar.Append(menu, "&File")
+        frame.SetMenuBar(menuBar)

         frame.Show(true)
         win = self.demoModule.runTest(frame, frame, Log())
 
         frame.Show(true)
         win = self.demoModule.runTest(frame, frame, Log())
 


@@ -54,9 +60,9 @@ class RunDemoApp(wxApp):
             # otherwise the demo made its own frame, so just put a
             # button in this one
             if hasattr(frame, 'otherWin'):
             # otherwise the demo made its own frame, so just put a
             # button in this one
             if hasattr(frame, 'otherWin'):

-                wxButton(frame, 1101, " Exit ")
+                b = wxButton(frame, -1, " Exit ")

                 frame.SetSize((200, 100))
                 frame.SetSize((200, 100))

-                EVT_BUTTON(frame, 1101, self.OnButton)
+                EVT_BUTTON(frame, b.GetId(), self.OnButton)

             else:
                 # It was probably a dialog or something that is already
                 # gone, so we're done.
             else:
                 # It was probably a dialog or something that is already
                 # gone, so we're done.