The "Exit" in the menu now exits the application in the wxpython.py

Czarek · Czarek · commit 0350c4f3295d · 2013-06-20T22:47:39.000+02:00
script.

The menu did not appear on Linux, it is required to put the browser
into some container, the gtk widget of the main frame cannot be
used to embed browser if the main frame needs to have a menu.
diff --git a/cefpython/cef1/linux/binaries_32bit/wxpython.py b/cefpython/cef1/linux/binaries_32bit/wxpython.py
@@ -107,7 +107,8 @@ def __init__(self):
     def CreateMenu(self):
         filemenu = wx.Menu()
         filemenu.Append(1, "Open")
-        filemenu.Append(2, "Exit")
+        exit = filemenu.Append(2, "Exit")
+        self.Bind(wx.EVT_MENU, self.OnClose, exit)
         aboutmenu = wx.Menu()
         aboutmenu.Append(1, "CEF Python")
         menubar = wx.MenuBar()
diff --git a/cefpython/cef1/linux/binaries_64bit/wxpython.py b/cefpython/cef1/linux/binaries_64bit/wxpython.py
@@ -74,15 +74,19 @@ class MainFrame(wx.Frame):
     browser = None
     initialized = False
     idleCount = 0
-    box = None
+    mainPanel = None
 
     def __init__(self):
         wx.Frame.__init__(self, parent=None, id=wx.ID_ANY,
                           title='wxPython example', size=(800,600))
         self.CreateMenu()
 
+        # Cannot attach browser to the main frame as this will cause
+        # the menu not to work.
+        self.mainPanel = wx.Panel(self)
+
         windowInfo = cefpython.WindowInfo()
-        windowInfo.SetAsChild(self.GetGtkWidget())
+        windowInfo.SetAsChild(self.mainPanel.GetGtkWidget())
         # Linux requires adding "file://" for local files,
         # otherwise /home/some will be replaced as http://home/some
         self.browser = cefpython.CreateBrowserSync(
@@ -107,7 +111,8 @@ def __init__(self):
     def CreateMenu(self):
         filemenu = wx.Menu()
         filemenu.Append(1, "Open")
-        filemenu.Append(2, "Exit")
+        exit = filemenu.Append(2, "Exit")
+        self.Bind(wx.EVT_MENU, self.OnClose, exit)
         aboutmenu = wx.Menu()
         aboutmenu.Append(1, "CEF Python")
         menubar = wx.MenuBar()
diff --git a/cefpython/cef1/windows/binaries/wxpython.py b/cefpython/cef1/windows/binaries/wxpython.py
@@ -83,7 +83,8 @@ def __init__(self):
     def CreateMenu(self):
         filemenu = wx.Menu()
         filemenu.Append(1, "Open")
-        filemenu.Append(2, "Exit")
+        exit = filemenu.Append(2, "Exit")
+        self.Bind(wx.EVT_MENU, self.OnClose, exit)
         aboutmenu = wx.Menu()
         aboutmenu.Append(1, "CEF Python")
         menubar = wx.MenuBar()
diff --git a/cefpython/cef3/windows/binaries/wxpython.py b/cefpython/cef3/windows/binaries/wxpython.py
@@ -83,7 +83,8 @@ def __init__(self):
     def CreateMenu(self):
         filemenu = wx.Menu()
         filemenu.Append(1, "Open")
-        filemenu.Append(2, "Exit")
+        exit = filemenu.Append(2, "Exit")
+        self.Bind(wx.EVT_MENU, self.OnClose, exit)
         aboutmenu = wx.Menu()
         aboutmenu.Append(1, "CEF Python")
         menubar = wx.MenuBar()
