s/GdkEventButton/GdkEvent/
* gal/widgets/e-popup-menu.c (e_popup_menu_run): s/GdkEventButton/GdkEvent/ * gal/widgets/e-gui-utils.c (e_popup_menu): ditto, and deal with key events as well svn path=/trunk/; revision=7660
This commit is contained in:
@ -56,13 +56,16 @@ e_auto_kill_popup_menu_on_hide (GtkMenu *menu)
|
||||
}
|
||||
|
||||
void
|
||||
e_popup_menu (GtkMenu *menu, GdkEventButton *event)
|
||||
e_popup_menu (GtkMenu *menu, GdkEvent *event)
|
||||
{
|
||||
g_return_if_fail (menu != NULL);
|
||||
g_return_if_fail (GTK_IS_MENU (menu));
|
||||
|
||||
e_auto_kill_popup_menu_on_hide (menu);
|
||||
gtk_menu_popup (menu, NULL, NULL, 0, NULL, event->button, event->time);
|
||||
if (event->type == GDK_KEY_PRESS)
|
||||
gtk_menu_popup (menu, NULL, NULL, 0, NULL, 0, event->key.time);
|
||||
else
|
||||
gtk_menu_popup (menu, NULL, NULL, 0, NULL, event->button.button, event->button.time);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include <libgnomeui/gnome-messagebox.h>
|
||||
|
||||
void e_popup_menu (GtkMenu *menu, GdkEventButton *event);
|
||||
void e_popup_menu (GtkMenu *menu, GdkEvent *event);
|
||||
void e_auto_kill_popup_menu_on_hide (GtkMenu *menu);
|
||||
void e_notice (GtkWindow *window, const char *type, const char *format, ...);
|
||||
void e_container_foreach_leaf (GtkContainer *container,
|
||||
|
||||
@ -109,7 +109,7 @@ e_popup_menu_create (EPopupMenu *menu_list, guint32 disable_mask, guint32 hide_m
|
||||
}
|
||||
|
||||
void
|
||||
e_popup_menu_run (EPopupMenu *menu_list, GdkEventButton *event, guint32 disable_mask, guint32 hide_mask, void *closure)
|
||||
e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, void *closure)
|
||||
{
|
||||
GtkMenu *menu;
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ GtkMenu *e_popup_menu_create (EPopupMenu *menu_list,
|
||||
void *closure);
|
||||
|
||||
void e_popup_menu_run (EPopupMenu *menu_list,
|
||||
GdkEventButton *event,
|
||||
GdkEvent *event,
|
||||
guint32 disable_mask,
|
||||
guint32 hide_mask,
|
||||
void *closure);
|
||||
|
||||
Reference in New Issue
Block a user