[gtk+/wip/attach-params-pass-event: 10/15] bb2042af gtkmenubutton
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/attach-params-pass-event: 10/15] bb2042af gtkmenubutton
- Date: Thu, 18 Feb 2016 16:08:51 +0000 (UTC)
commit 87adc3aafea75c2cdf1d662e846d830346825f55
Author: William Hua <william hua canonical com>
Date: Wed Feb 17 14:47:40 2016 -0500
bb2042af gtkmenubutton
gtk/gtkmenubutton.c | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 7e146d5..9d0d460 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -245,9 +245,6 @@ popup_menu (GtkMenuButton *menu_button,
GdkEvent *event)
{
GtkMenuButtonPrivate *priv = menu_button->priv;
- GdkSeat *seat;
- guint button;
- guint32 time;
GdkWindowTypeHint type_hint;
GdkAttachParams *params;
GtkWidget *attach_widget;
@@ -258,20 +255,6 @@ popup_menu (GtkMenuButton *menu_button,
if (!priv->menu)
return;
- if (event != NULL &&
- gdk_event_get_screen (event) == gtk_widget_get_screen (GTK_WIDGET (menu_button)))
- {
- seat = gdk_event_get_seat (event);
- gdk_event_get_button (event, &button);
- time = gdk_event_get_time (event);
- }
- else
- {
- seat = NULL;
- button = 0;
- time = gtk_get_current_event_time ();
- }
-
params = gdk_attach_params_new ();
attach_widget = GTK_WIDGET (menu_button);
@@ -385,11 +368,9 @@ popup_menu (GtkMenuButton *menu_button,
}
gtk_menu_popup_with_params (GTK_MENU (priv->menu),
- seat,
+ event,
NULL,
attach_widget,
- button,
- time,
TRUE,
type_hint,
params);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]