Changeset 945:90f458a3bc2d for src

Timestamp:

04/30/19 14:49:39 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

ACARS CEF works on Windows (re #347)

Location:

src/mlx/gui

Files:

• cef.py (modified) (3 diffs)
• gui.py (modified) (2 diffs)

src/mlx/gui/cef.py

@@ -14 +14 @@
 import tempfile
 import traceback
+import ctypes
 import urllib.request, urllib.error, urllib.parse
 from lxml import etree
@@ -322 +323 @@
     """Start a browser instance in the given container with the given URL."""
     if os.name=="nt":
-        window = container.get_window()
-        if window is None:
-            print("mlx.gui.cef.startInContainer: no window found!")
-            windowID = None
-        else:
-            windowID = window.handle
+        gdk.threads_enter()
+        ctypes.pythonapi.PyCapsule_GetPointer.restype = ctypes.c_void_p
+        ctypes.pythonapi.PyCapsule_GetPointer.argtypes = \
+            [ctypes.py_object]
+        gpointer = ctypes.pythonapi.PyCapsule_GetPointer(
+            container.get_property("window").__gpointer__, None)
+        libgdk = ctypes.CDLL("libgdk-3-0.dll")
+        windowID = libgdk.gdk_win32_window_get_handle(gpointer)
+        container.windowID = windowID
+        gdk.threads_leave()
     else:
         container.set_visual(container.get_screen().lookup_visual(0x21))
@@ -427 +432 @@
 
 def _handleSizeAllocate(widget, sizeAlloc):
-    """Handle the size-allocate event."""
-    window = widget.get_window()
+    """Handle the size-allocate event on Windows."""
     if widget is not None:
-        cefpython.WindowUtils.OnSize(window.handle, 0, 0, 0)
+        cefpython.WindowUtils.OnSize(widget.windowID, 0, 0, 0)

src/mlx/gui/gui.py

@@ -199 +199 @@
 
         window.show_all()
-        if os.name=="nt":
-            window.get_window().focus()
 
         self._wizard.grabDefault()
@@ -767 +765 @@
         Here we reset the focus to the main window as CEF might have acquired
         it earlier."""
-        self._mainWindow.get_window().focus()
+        self._mainWindow.get_window().focus(0)
 
     def raiseCallback(self):