From bd383aef9c22505a0af781011c2578122a8178cf Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 4 Jan 2018 10:59:31 +0000 Subject: [PATCH] we don't need the "view-to-window" mapping unless we're doing wheel events via gdk_bindings (which isn't ported to GTK3 yet) git-svn-id: https://xpra.org/svn/Xpra/trunk@17878 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/platform/darwin/gui.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/xpra/platform/darwin/gui.py b/src/xpra/platform/darwin/gui.py index abb72d2bd7..4fe38a247c 100644 --- a/src/xpra/platform/darwin/gui.py +++ b/src/xpra/platform/darwin/gui.py @@ -522,26 +522,28 @@ def cb(menu_item): def add_window_hooks(window): window.connect("focus-in-event", window_focused) - global VIEW_TO_WINDOW - try: - gdkwin = window.get_window() - VIEW_TO_WINDOW[gdkwin.nsview] = window - except: - log("add_window_hooks(%s)", window, exc_info=True) - log.error("Error: failed to associate window %s with its nsview", window, exc_info=True) + if WHEEL and PYTHON2: + global VIEW_TO_WINDOW + try: + gdkwin = window.get_window() + VIEW_TO_WINDOW[gdkwin.nsview] = window + except: + log("add_window_hooks(%s)", window, exc_info=True) + log.error("Error: failed to associate window %s with its nsview", window, exc_info=True) def remove_window_hooks(window): try: del window_menus[window] except: pass - global VIEW_TO_WINDOW - #this should be redundant as we use weak references: - try: - gdkwin = window.get_window() - del VIEW_TO_WINDOW[gdkwin.nsview] - except: - pass + if WHEEL and PYTHON2: + global VIEW_TO_WINDOW + #this should be redundant as we use weak references: + try: + gdkwin = window.get_window() + del VIEW_TO_WINDOW[gdkwin.nsview] + except: + pass def _set_osx_window_menu(add, wid, window, menus, application_action_callback=None, window_action_callback=None):