Fix "warning: operation on 'y' may be undefined".

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

diff --git a/wxPython/demo/Menu.py b/wxPython/demo/Menu.py
index 45ca029fba88dcc92ffb6592645f4af41b808c0f..57bd44ce8077d91c37f1d6b147e7a77d81d2eaad 100644 (file)
--- a/wxPython/demo/Menu.py
+++ b/wxPython/demo/Menu.py
@@ -135,11 +135,12 @@ check the source for this sample to see how to implement them.
     # Methods
 
     def OnMenuHighlight(self, event):
     # Methods
 
     def OnMenuHighlight(self, event):

-        # Show how to get menu item imfo from this event handler
+        # Show how to get menu item info from this event handler

         id = event.GetMenuId()
         item = self.GetMenuBar().FindItemById(id)
         id = event.GetMenuId()
         item = self.GetMenuBar().FindItemById(id)

-        text = item.GetText()
-        help = item.GetHelp()
+        if item:
+            text = item.GetText()
+            help = item.GetHelp()

 
         # but in this case just call Skip so the default is done
         event.Skip() 
 
         # but in this case just call Skip so the default is done
         event.Skip() 


@@ -250,16 +251,29 @@ check the source for this sample to see how to implement them.
         menu.InsertItem(pos, item)
 
 
         menu.InsertItem(pos, item)
 
 

-#-------------------------------------------------------------------
+#---------------------------------------------------------------------------

 
 

-wx.RegisterId(10000)
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)

 
 

-def runTest(frame, nb, log):
-    win = MyFrame(frame, -1, log)
-    frame.otherWin = win
-    win.Show(True)
+        b = wx.Button(self, -1, "Show the Menu sample", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        win = MyFrame(self, -1, self.log)
+        win.Show(True)

 
 
 
 

+#---------------------------------------------------------------------------
+
+
+def runTest(frame, nb, log):
+    win = TestPanel(nb, log)
+    return win
+

 #-------------------------------------------------------------------
 
 
 #-------------------------------------------------------------------
 
 


@@ -297,5 +311,5 @@ and GTK+ currently.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])