use compat layer for event mask

git-svn-id: https://xpra.org/svn/Xpra/trunk@8113 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Nov 14, 2014 · ee69041 · ee69041
1 parent aa1a4a7
commit ee69041
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/xpra/client/gtk_base/gtk_tray_menu_base.py b/src/xpra/client/gtk_base/gtk_tray_menu_base.py
@@ -11,7 +11,7 @@
 gobject = import_gobject()
 
 from xpra.util import CLIENT_EXIT
-from xpra.gtk_common.gtk_util import ensure_item_selected, menuitem
+from xpra.gtk_common.gtk_util import ensure_item_selected, menuitem, BUTTON_PRESS_MASK
 from xpra.client.client_base import EXIT_OK
 from xpra.client.gtk_base.about import about, close_about
 from xpra.codecs.loader import PREFERED_ENCODING_ORDER, ENCODINGS_HELP, ENCODINGS_TO_NAME
@@ -61,7 +61,7 @@ def __init__(self, label, tooltip=None):
         self.label = label
         if tooltip:
             self.set_tooltip_text(tooltip)
-        self.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+        self.add_events(BUTTON_PRESS_MASK)
         self.connect("button-release-event", self.on_button_release_event)
 
     def on_button_release_event(self, *args):

diff --git a/src/xpra/gtk_common/gtk_util.py b/src/xpra/gtk_common/gtk_util.py
@@ -97,6 +97,7 @@ def pixbuf_new_from_data(*args):
     FILE_CHOOSER_ACTION_SAVE    = gtk.FileChooserAction.SAVE
     FILE_CHOOSER_ACTION_OPEN    = gtk.FileChooserAction.OPEN
     PROPERTY_CHANGE_MASK = gdk.EventMask.PROPERTY_CHANGE_MASK
+    BUTTON_PRESS_MASK    = gdk.EventMask.BUTTON_PRESS_MASK
     ACCEL_LOCKED = gtk.AccelFlags.LOCKED
     ACCEL_VISIBLE = gtk.AccelFlags.VISIBLE
     JUSTIFY_LEFT    = gtk.Justification.LEFT
@@ -200,6 +201,7 @@ def cairo_set_source_pixbuf(cr, pixbuf, x, y):
     FILE_CHOOSER_ACTION_SAVE    = gtk.FILE_CHOOSER_ACTION_SAVE
     FILE_CHOOSER_ACTION_OPEN    = gtk.FILE_CHOOSER_ACTION_OPEN
     PROPERTY_CHANGE_MASK = gdk.PROPERTY_CHANGE_MASK
+    BUTTON_PRESS_MASK    = gdk.BUTTON_PRESS_MASK
     ACCEL_LOCKED = gtk.ACCEL_LOCKED
     ACCEL_VISIBLE = gtk.ACCEL_VISIBLE
     JUSTIFY_LEFT    = gtk.JUSTIFY_LEFT