From 51fb53c2dec96209843c6bdf33eaf6691d24ac1d Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Fri, 9 May 2008 11:01:37 +0000 Subject: [PATCH] Fix the event of the mainmenu to display on keyboard and mouse (Old svn revision: 4750) --- src/callbacks.c | 5 ++--- src/callbacks.h | 2 +- src/interface.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/callbacks.c b/src/callbacks.c index d451ba4..456249c 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -21,12 +21,11 @@ #include "callbacks.h" #include "menu-positions.h" -void on_button1_button_press_event(GtkButton *button, GdkEventButton *event) +void on_button1_activate(GtkButton *button) { - GdkEventButton *mouseevent = (GdkEventButton *)event; if(mainmenu == NULL) mainmenu = create_mainmenu(); - gtk_menu_popup(GTK_MENU(mainmenu), NULL, NULL, (GtkMenuPositionFunc)position_mainmenu, button, mouseevent->button, mouseevent->time); + gtk_menu_popup(GTK_MENU(mainmenu), NULL, NULL, (GtkMenuPositionFunc)position_mainmenu, button, 0, gtk_get_current_event_time()); } void on_button3_toggled_event(GtkButton *button, GdkEventButton *event) diff --git a/src/callbacks.h b/src/callbacks.h index b9afe45..386c8d3 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -33,7 +33,7 @@ #include "xfce-taskmanager-linux.h" -void on_button1_button_press_event(GtkButton *button, GdkEventButton *event); +void on_button1_activate(GtkButton *button); void on_button3_toggled_event(GtkButton *button, GdkEventButton *event); gboolean on_treeview1_button_press_event(GtkButton *button, GdkEventButton *event); void on_info1_activate (GtkMenuItem *menuitem, gpointer user_data); diff --git a/src/interface.c b/src/interface.c index ec8eaa9..6f5c1b1 100644 --- a/src/interface.c +++ b/src/interface.c @@ -110,7 +110,7 @@ GtkWidget* create_main_window (void) g_signal_connect ((gpointer) window, "delete-event", G_CALLBACK (on_quit), NULL); g_signal_connect_swapped ((gpointer) treeview, "button-press-event", G_CALLBACK(on_treeview1_button_press_event), NULL); g_signal_connect ((gpointer) button1, "clicked", G_CALLBACK (on_quit), NULL); - g_signal_connect ((gpointer) button2, "button_release_event", G_CALLBACK (on_button1_button_press_event), NULL); + g_signal_connect ((gpointer) button2, "clicked", G_CALLBACK (on_button1_activate), NULL); g_signal_connect ((gpointer) button3, "toggled", G_CALLBACK (on_button3_toggled_event), NULL); return window;