diff options
| author | William Hua <william.hua@canonical.com> | 2015-09-23 11:47:07 -0400 |
|---|---|---|
| committer | William Hua <william.hua@canonical.com> | 2015-10-14 17:43:44 +0100 |
| commit | 153d6cc2a2c84a5563173b722fd46c760d76f708 (patch) | |
| tree | 7ea2760eea132bd71871ff49bfcd72ff2bdab290 | |
| parent | 01d7f90ec1c1fcde6320cdb6adcb724921a04963 (diff) | |
| download | gtk+-153d6cc2a2c84a5563173b722fd46c760d76f708.tar.gz | |
gtkwindow: use gtk_menu_popup_with_parameters ()
| -rw-r--r-- | gtk/gtkwindow.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index bc8ba327a3..d77d565c99 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -8646,15 +8646,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) { @@ -8690,16 +8681,13 @@ 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_parameters (GTK_MENU (priv->popup_menu), + NULL, + NULL, + NULL, + event ? event->button : 0, + event ? event->time : gtk_get_current_event_time (), + NULL); } static void |