Skip to content

Commit f0ab15f

Browse files
committed
Fixup menu for GTK3
1 parent 598af3e commit f0ab15f

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

xdot.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@ def __init__(self, command_line_files, widget=None):
20132013

20142014
# Connect the Button click event of the drawing menu, in order
20152015
# to display a file menu
2016-
self.widget.connect("button-press-event", self.on_file_menu)
2016+
self.dotwidget.connect("button-press-event", self.on_file_menu)
20172017

20182018
self.connect('key-press-event', self.on_key_press_event)
20192019

@@ -2158,21 +2158,25 @@ def on_go_back(self, action = None):
21582158
self.open_file(self.open_files[self.open_file_idx])
21592159

21602160
def on_file_menu(self, widget, event):
2161-
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
2162-
menu = gtk.Menu()
2161+
if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3:
2162+
menu = Gtk.Menu()
21632163
for filename in self.open_files:
21642164
label = os.path.basename(filename)
2165-
item = gtk.MenuItem(label)
2166-
menu.append(item)
2165+
item = Gtk.MenuItem()
2166+
item.set_label(label)
21672167
item.connect("activate", lambda _, f: self.open_file(f), filename)
2168-
item.show()
2169-
menu.popup(None, None, None, 3, event.time)
2168+
menu.append(item)
2169+
menu.show_all()
2170+
self.menu = menu
2171+
menu.popup(None, None, None, None,
2172+
event.button, event.time)
2173+
return True
21702174

21712175
def on_key_press_event(self, widget, event):
2172-
if event.keyval == gtk.keysyms.bracketleft:
2176+
if event.keyval == Gdk.KEY_bracketleft:
21732177
self.on_go_back()
21742178
return True
2175-
if event.keyval == gtk.keysyms.bracketright:
2179+
if event.keyval == Gdk.KEY_bracketright:
21762180
self.on_go_forward()
21772181
return True
21782182

0 commit comments

Comments
 (0)