Update wxpython.py - it runs, but with issues (resize and probably more)

cztomczak · cztomczak · commit 57282f6dd87f · 2016-06-29T17:55:02.000+02:00
diff --git a/src/linux/binaries_64bit/pygtk_.py b/src/linux/binaries_64bit/pygtk_.py
@@ -179,7 +179,6 @@ def OnVBoxSize(self, widget, data):
             width = data.width
             height = data.height - self.menubar_height
             self.browser.SetBounds(x, y, width, height)
-            print("%s %s %s %s" % (x,y,width,height))
 
     def OnMenubarSize(self, widget, data):
         self.menubar_height = data.height
diff --git a/src/linux/binaries_64bit/wxpython.py b/src/linux/binaries_64bit/wxpython.py
@@ -132,7 +132,11 @@ def __init__(self, url=None):
                 clientHandler._OnAfterCreated)
 
         windowInfo = cefpython.WindowInfo()
-        windowInfo.SetAsChild(self.mainPanel.GetGtkWidget())
+        # Must show window otherwise GetHandle() returns 0
+        self.Show()
+        cefpython.WindowUtils.InstallX11ErrorHandlers()
+        windowInfo.SetAsChild(self.mainPanel.GetHandle(),
+                              [0,0,0,0])
         # Linux requires adding "file://" for local files,
         # otherwise /home/some will be replaced as http://home/some
         self.browser = cefpython.CreateBrowserSync(
@@ -176,12 +180,12 @@ def CreateMenu(self):
     def OnClose(self, event):
         # In wx.chromectrl calling browser.CloseBrowser() and/or
         # self.Destroy() in OnClose is causing crashes when embedding
-        # multiple browser tabs. The solution is to call only 
+        # multiple browser tabs. The solution is to call only
         # browser.ParentWindowWillClose. Behavior of this example
         # seems different as it extends wx.Frame, while ChromeWindow
         # from chromectrl extends wx.Window. Calling CloseBrowser
         # and Destroy does not cause crashes, but is not recommended.
-        # Call ParentWindowWillClose and event.Skip() instead. See 
+        # Call ParentWindowWillClose and event.Skip() instead. See
         # also Issue 107.
         self.browser.ParentWindowWillClose()
         event.Skip()
@@ -206,9 +210,9 @@ def GoForward(self):
         self.mainBrowser.GoForward()
 
     def CreateAnotherBrowser(self, url=None):
-        """ 
+        """
         TODO: There are errors in the console when closing the window:
-        >> Check failed: window 
+        >> Check failed: window
         >> Gdk: _gdk_window_destroy_hierarchy: assertion `GDK_IS_WINDOW\
         >>      (window)' failed
         >> GLib-GObject: g_object_unref: assertion `G_IS_OBJECT (object)' failed
@@ -384,16 +388,19 @@ def OnConsoleMessage(self, browser, message, source, line):
 
     def OnPreKeyEvent(self, browser, event, eventHandle,
             isKeyboardShortcutOut):
-        print("[wxpython.py] KeyboardHandler::OnPreKeyEvent()")
 
-    def OnKeyEvent(self, browser, event, eventHandle):
-        if event["type"] == cefpython.KEYEVENT_KEYUP:
-            # OnKeyEvent is called twice for F5/Esc keys, with event
-            # type KEYEVENT_RAWKEYDOWN and KEYEVENT_KEYUP.
-            # Normal characters a-z should have KEYEVENT_CHAR.
-            return False
-        print("[wxpython.py] KeyboardHandler::OnKeyEvent()")
-        print("    type=%s" % event["type"])
+        stype = event["type"]
+        if stype == cefpython.KEYEVENT_RAWKEYDOWN:
+            stype = "RAWKEYDOWN"
+        elif stype == cefpython.KEYEVENT_KEYDOWN:
+            stype = "KEYDOWN"
+        elif stype == cefpython.KEYEVENT_KEYUP:
+            stype = "KEYUP"
+        elif stype == cefpython.KEYEVENT_CHAR:
+            stype = "CHAR"
+
+        print("[wxpython.py] KeyboardHandler::OnPreKeyEvent()")
+        print("    type=%s" % stype)
         print("    modifiers=%s" % event["modifiers"])
         print("    windows_key_code=%s" % event["windows_key_code"])
         print("    native_key_code=%s" % event["native_key_code"])
@@ -402,29 +409,9 @@ def OnKeyEvent(self, browser, event, eventHandle):
         print("    unmodified_character=%s" % event["unmodified_character"])
         print("    focus_on_editable_field=%s"\
                 % event["focus_on_editable_field"])
-        if platform.system() == "Linux":
-            # F5
-            if event["native_key_code"] == 71:
-                print("[wxpython.py] F5 pressed, calling"\
-                        " browser.ReloadIgnoreCache()")
-                browser.ReloadIgnoreCache()
-                return True
-            # Escape
-            if event["native_key_code"] == 9:
-                print("[wxpython.py] Esc pressed, calling browser.StopLoad()")
-                browser.StopLoad()
-                return True
-            # F12
-            if event["native_key_code"] == 96:
-                print("[wxpython.py] F12 pressed, calling"\
-                        " browser.ShowDevTools()")
-                browser.ShowDevTools()
-                return True
-        elif platform.system() == "Windows":
-            # F5 todo
-            # Escape todo
-            pass
-        return False
+
+    def OnKeyEvent(self, browser, event, eventHandle):
+        pass
 
     # -------------------------------------------------------------------------
     # RequestHandler
@@ -562,7 +549,7 @@ def OnLoadEnd(self, browser, frame, httpStatusCode):
         print("    http status code = %s" % httpStatusCode)
         # Tests for the Browser object methods
         self._Browser_LoadUrl(browser)
-        
+
     def _Browser_LoadUrl(self, browser):
         if browser.GetUrl() == "data:text/html,Test#Browser.LoadUrl":
              browser.LoadUrl("file://"+GetApplicationPath("wxpython.html"))
@@ -731,7 +718,7 @@ def GetSources():
         # is set to True. It will force a separate renderer process
         # for each browser created using CreateBrowserSync.
         "unique_request_context_per_browser": True,
-        # Downloads are handled automatically. A default SaveAs file 
+        # Downloads are handled automatically. A default SaveAs file
         # dialog provided by OS will be displayed.
         "downloads_enabled": True,
         # Remote debugging port, required for Developer Tools support.
@@ -759,7 +746,7 @@ def GetSources():
         # "file_access_from_file_urls_allowed": True,
         # "universal_access_from_file_urls_allowed": True,
     }
-    
+
     # Command line switches set programmatically
     switches = {
         # "proxy-server": "socks5://127.0.0.1:8888",
@@ -769,12 +756,12 @@ def GetSources():
         # "disable-gpu": "",
         # "--invalid-switch": "" -> Invalid switch name
     }
-    
+
     cefpython.Initialize(settings, switches)
-    
+
     app = MyApp(False)
     app.MainLoop()
     # Let wx.App destructor do the cleanup before calling cefpython.Shutdown().
     del app
-    
+
     cefpython.Shutdown()
