diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-10-31 07:41:15 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-10-31 08:25:37 +0100 |
| commit | 07164e098a1c9d71ab580912cd7f37020a18c2e7 (patch) | |
| tree | 54d09681086f8897295e5acfff60ebe32f70ddfe /gtk/gtktooltip.c | |
| parent | b0dc8514e440a75753e91119cd90646fc08f8059 (diff) | |
| download | gtk+-07164e098a1c9d71ab580912cd7f37020a18c2e7.tar.gz | |
window: Turn gtk_window_set_screen() into gtk_window_set_display()
And have a priv->display instead of a priv->screen.
Includes turning gtk_menu_set_screen() into gtk_menu_set_display(),
because that function just forwards to its window.
Diffstat (limited to 'gtk/gtktooltip.c')
| -rw-r--r-- | gtk/gtktooltip.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index 5bf83176fe..6112ef0a97 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -1051,8 +1051,6 @@ static void gtk_tooltip_show_tooltip (GdkDisplay *display) { gint x, y; - GdkScreen *screen; - GdkWindow *window; GtkWidget *tooltip_widget; GtkTooltip *tooltip; @@ -1101,16 +1099,14 @@ gtk_tooltip_show_tooltip (GdkDisplay *display) tooltip->current_window = GTK_WINDOW (GTK_TOOLTIP (tooltip)->window); } - screen = gtk_widget_get_screen (tooltip_widget); - /* FIXME: should use tooltip->current_window iso tooltip->window */ - if (screen != gtk_widget_get_screen (tooltip->window)) + if (display != gtk_widget_get_display (tooltip->window)) { g_signal_handlers_disconnect_by_func (display, gtk_tooltip_display_closed, tooltip); - gtk_window_set_screen (GTK_WINDOW (tooltip->window), screen); + gtk_window_set_display (GTK_WINDOW (tooltip->window), display); g_signal_connect (display, "closed", G_CALLBACK (gtk_tooltip_display_closed), tooltip); |