Simplify PCH support. Minor source cleaning.

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

diff --git a/wxPython/demo/PopupMenu.py b/wxPython/demo/PopupMenu.py
index ae9e93c71086b89ec2369d8c90ce781dacf3a594..837e9c27d46305bf4885cf9bc8d214f4ee5703e2 100644 (file)
--- a/wxPython/demo/PopupMenu.py
+++ b/wxPython/demo/PopupMenu.py
@@ -1,77 +1,85 @@
 
 

-from wxPython.wx import *
-import images
+import  wx
+
+import  images

 
 #----------------------------------------------------------------------
 
 text = """\
 
 
 #----------------------------------------------------------------------
 
 text = """\
 

-Right-click on the panel (or Ctrl-click on the Mac) to show a popup
-menu.  Then look at the code for this sample.  Notice how the
-PopupMenu method is similar to the ShowModal method of a wxDialog in
-that it doesn't return until the popup menu has been dismissed.  The
-event handlers for the popup menu items can either be attached to the
-menu itself, or to the window that invokes PopupMenu.
+Right-click on any bare area of this panel (or Ctrl-click on the Mac)
+to show a popup menu.  Then look at the code for this sample.  Notice
+how the PopupMenu method is similar to the ShowModal method of a
+wx.Dialog in that it doesn't return until the popup menu has been
+dismissed.  The event handlers for the popup menu items can either be
+attached to the menu itself, or to the window that invokes PopupMenu.

 """
 
 #----------------------------------------------------------------------
 
 """
 
 #----------------------------------------------------------------------
 

-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):

     def __init__(self, parent, log):
         self.log = log
     def __init__(self, parent, log):
         self.log = log

-        wxPanel.__init__(self, parent, -1)
-        box = wxBoxSizer(wxVERTICAL)
+        wx.Panel.__init__(self, parent, -1)
+        box = wx.BoxSizer(wx.VERTICAL)

 
         # Make and layout the controls
         fs = self.GetFont().GetPointSize()
 
         # Make and layout the controls
         fs = self.GetFont().GetPointSize()

-        bf = wxFont(fs+4, wxSWISS, wxNORMAL, wxBOLD)
-        nf = wxFont(fs+2, wxSWISS, wxNORMAL, wxNORMAL)
+        bf = wx.Font(fs+4, wx.SWISS, wx.NORMAL, wx.BOLD)
+        nf = wx.Font(fs+2, wx.SWISS, wx.NORMAL, wx.NORMAL)

 
 

-        t = wxStaticText(self, -1, "PopupMenu")
+        t = wx.StaticText(self, -1, "PopupMenu")

         t.SetFont(bf)
         t.SetFont(bf)

-        box.Add(t, 0, wxCENTER|wxALL, 5)
+        box.Add(t, 0, wx.CENTER|wx.ALL, 5)

 
 

-        box.Add(wxStaticLine(self, -1), 0, wxEXPAND)
+        box.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)

         box.Add((10,20))
 
         box.Add((10,20))
 

-        t = wxStaticText(self, -1, text)
+        t = wx.StaticText(self, -1, text)

         t.SetFont(nf)
         t.SetFont(nf)

-        box.Add(t, 0, wxCENTER|wxALL, 5)
+        box.Add(t, 0, wx.CENTER|wx.ALL, 5)
+        t.Bind(wx.EVT_CONTEXT_MENU, self.OnContextMenu)

 
         self.SetSizer(box)
 
 
         self.SetSizer(box)
 

-        EVT_RIGHT_UP(self, self.OnRightClick)
+        self.Bind(wx.EVT_CONTEXT_MENU, self.OnContextMenu)

 
 
 
 

-    def OnRightClick(self, event):
-        self.log.WriteText("OnRightClick\n")
+    def OnContextMenu(self, event):
+        self.log.WriteText("OnContextMenu\n")

 
         # only do this part the first time so the events are only bound once
 
         # only do this part the first time so the events are only bound once

+        #
+        # Yet another anternate way to do IDs. Some prefer them up top to
+        # avoid clutter, some prefer them close to the object of interest
+        # for clarity. 

         if not hasattr(self, "popupID1"):
         if not hasattr(self, "popupID1"):

-            self.popupID1 = wxNewId()
-            self.popupID2 = wxNewId()
-            self.popupID3 = wxNewId()
-            self.popupID4 = wxNewId()
-            self.popupID5 = wxNewId()
-            self.popupID6 = wxNewId()
-            self.popupID7 = wxNewId()
-            self.popupID8 = wxNewId()
-            self.popupID9 = wxNewId()
-            EVT_MENU(self, self.popupID1, self.OnPopupOne)
-            EVT_MENU(self, self.popupID2, self.OnPopupTwo)
-            EVT_MENU(self, self.popupID3, self.OnPopupThree)
-            EVT_MENU(self, self.popupID4, self.OnPopupFour)
-            EVT_MENU(self, self.popupID5, self.OnPopupFive)
-            EVT_MENU(self, self.popupID6, self.OnPopupSix)
-            EVT_MENU(self, self.popupID7, self.OnPopupSeven)
-            EVT_MENU(self, self.popupID8, self.OnPopupEIght)
-            EVT_MENU(self, self.popupID9, self.OnPopupNine)
+            self.popupID1 = wx.NewId()
+            self.popupID2 = wx.NewId()
+            self.popupID3 = wx.NewId()
+            self.popupID4 = wx.NewId()
+            self.popupID5 = wx.NewId()
+            self.popupID6 = wx.NewId()
+            self.popupID7 = wx.NewId()
+            self.popupID8 = wx.NewId()
+            self.popupID9 = wx.NewId()
+
+            self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1)
+            self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2)
+            self.Bind(wx.EVT_MENU, self.OnPopupThree, id=self.popupID3)
+            self.Bind(wx.EVT_MENU, self.OnPopupFour, id=self.popupID4)
+            self.Bind(wx.EVT_MENU, self.OnPopupFive, id=self.popupID5)
+            self.Bind(wx.EVT_MENU, self.OnPopupSix, id=self.popupID6)
+            self.Bind(wx.EVT_MENU, self.OnPopupSeven, id=self.popupID7)
+            self.Bind(wx.EVT_MENU, self.OnPopupEight, id=self.popupID8)
+            self.Bind(wx.EVT_MENU, self.OnPopupNine, id=self.popupID9)

 
         # make a menu
 
         # make a menu

-        menu = wxMenu()
+        menu = wx.Menu()

         # Show how to put an icon in the menu
         # Show how to put an icon in the menu

-        item = wxMenuItem(menu, self.popupID1,"One")
-        item.SetBitmap(images.getSmilesBitmap())
+        item = wx.MenuItem(menu, self.popupID1,"One")
+        bmp = images.getSmilesBitmap()
+        item.SetBitmap(bmp)

         menu.AppendItem(item)
         # add some other items
         menu.Append(self.popupID2, "Two")
         menu.AppendItem(item)
         # add some other items
         menu.Append(self.popupID2, "Two")


@@ -80,7 +88,7 @@ class TestPanel(wxPanel):
         menu.Append(self.popupID5, "Five")
         menu.Append(self.popupID6, "Six")
         # make a submenu
         menu.Append(self.popupID5, "Five")
         menu.Append(self.popupID6, "Six")
         # make a submenu

-        sm = wxMenu()
+        sm = wx.Menu()

         sm.Append(self.popupID8, "sub item 1")
         sm.Append(self.popupID9, "sub item 1")
         menu.AppendMenu(self.popupID7, "Test Submenu", sm)
         sm.Append(self.popupID8, "sub item 1")
         sm.Append(self.popupID9, "sub item 1")
         menu.AppendMenu(self.popupID7, "Test Submenu", sm)


@@ -88,7 +96,7 @@ class TestPanel(wxPanel):
 
         # Popup the menu.  If an item is selected then its handler
         # will be called before PopupMenu returns.
 
         # Popup the menu.  If an item is selected then its handler
         # will be called before PopupMenu returns.

-        self.PopupMenu(menu, event.GetPosition())
+        self.PopupMenu(menu)

         menu.Destroy()
 
 
         menu.Destroy()
 
 


@@ -113,7 +121,7 @@ class TestPanel(wxPanel):
     def OnPopupSeven(self, event):
         self.log.WriteText("Popup seven\n")
 
     def OnPopupSeven(self, event):
         self.log.WriteText("Popup seven\n")
 

-    def OnPopupEIght(self, event):
+    def OnPopupEight(self, event):

         self.log.WriteText("Popup eight\n")
 
     def OnPopupNine(self, event):
         self.log.WriteText("Popup eight\n")
 
     def OnPopupNine(self, event):


@@ -144,5 +152,5 @@ overview = """<html><body>
 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:])