diff options
| author | William Hua <william.hua@canonical.com> | 2015-09-23 11:47:07 -0400 |
|---|---|---|
| committer | William Hua <william.hua@canonical.com> | 2016-01-06 10:37:41 -0500 |
| commit | f6d47073a282ef2fb7422e924334fdc31e8bd1b9 (patch) | |
| tree | 8ff9e77e8b8bc747e7df755596ef20ab3aed91df | |
| parent | a400dc51ca847ae13389231930263759f6267a4f (diff) | |
| download | gtk+-f6d47073a282ef2fb7422e924334fdc31e8bd1b9.tar.gz | |
gtkwindow: use gtk_menu_popup_with_params ()
| -rw-r--r-- | gtk/gtkwindow.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index b929a9c618..8b0f896d43 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8785,15 +8785,6 @@ popup_menu_detach (GtkWidget *widget, } static void -popup_position_func (GtkMenu *menu, - gint *x, - gint *y, - gboolean *push_in, - gpointer user_data) -{ -} - -static void close_window_clicked (GtkMenuItem *menuitem, gpointer user_data) { @@ -8829,16 +8820,15 @@ gtk_window_do_popup_fallback (GtkWindow *window, G_CALLBACK (close_window_clicked), window); gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem); - if (event) - gtk_menu_popup (GTK_MENU (priv->popup_menu), - NULL, NULL, - NULL, NULL, - event->button, event->time); - else - gtk_menu_popup (GTK_MENU (priv->popup_menu), - NULL, NULL, - popup_position_func, window, - 0, gtk_get_current_event_time ()); + gtk_menu_popup_with_params (GTK_MENU (priv->popup_menu), + NULL, + NULL, + NULL, + event ? event->button : 0, + event ? event->time : gtk_get_current_event_time (), + TRUE, + GDK_WINDOW_TYPE_HINT_POPUP_MENU, + NULL); } static void |