Skip to content

Commit

Permalink
oops: missed from r18434
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@18436 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 14, 2018
1 parent c86a3b6 commit 5ab7e5a
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions src/xpra/gtk_common/gtk_util.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# This file is part of Xpra.
# Copyright (C) 2011-2017 Antoine Martin <[email protected]>
# Copyright (C) 2011-2018 Antoine Martin <[email protected]>
# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
# later version. See the file COPYING for details.

Expand Down Expand Up @@ -353,7 +353,10 @@ def pack_start(self, child, expand=True, fill=True, padding=0):
gtk.combo_box_new_text = gtk.ComboBoxText

class OptionMenu(gtk.MenuButton):
pass
def set_menu(self, menu):
return self.set_popup(menu)
def get_menu(self):
return self.get_popup()

gdk_window_process_all_updates = gdk.Window.process_all_updates
def gtk_main():
Expand Down Expand Up @@ -653,6 +656,21 @@ def gtk_main():
GRAB_FROZEN : "FROZEN",
}

VISUAL_NAMES = {
STATIC_GRAY : "STATIC_GRAY",
GRAYSCALE : "GRAYSCALE",
STATIC_COLOR : "STATIC_COLOR",
PSEUDO_COLOR : "PSEUDO_COLOR",
TRUE_COLOR : "TRUE_COLOR",
DIRECT_COLOR : "DIRECT_COLOR",
}

BYTE_ORDER_NAMES = {
LSB_FIRST : "LSB",
MSB_FIRST : "MSB",
}



class TrayCheckMenuItem(gtk.CheckMenuItem):
""" We add a button handler to catch clicks that somehow do not
Expand Down

0 comments on commit 5ab7e5a

Please sign in to comment.