AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

window: Stop using gdk_screen_get_n_monitors

Browse Source
This commit is contained in:
Matthias Clasen 2016-04-10 23:52:00 -04:00
parent 03d70f1636
commit 952d0fd23f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkwindow.c
View File

@ -6188,7 +6188,7 @@ gtk_window_map (GtkWidget *widget)
GtkWindowPrivate *priv = window->priv; GtkWindowPrivate *priv = window->priv;
GdkWindow *gdk_window; GdkWindow *gdk_window;
GList *link; GList *link;
GdkScreen *screen; GdkDisplay *display;
if (!_gtk_widget_is_toplevel (widget)) if (!_gtk_widget_is_toplevel (widget))
{ {
@ -6196,10 +6196,10 @@ gtk_window_map (GtkWidget *widget)
return; return;
} }
screen = _gtk_window_get_screen (window); display = gtk_widget_get_display (widget);
if (priv->initial_fullscreen_monitor > gdk_screen_get_n_monitors (screen)) if (priv->initial_fullscreen_monitor > gdk_display_get_n_monitors (display))
priv->initial_fullscreen_monitor = -1; priv->initial_fullscreen_monitor = -1;
gtk_widget_set_mapped (widget, TRUE); gtk_widget_set_mapped (widget, TRUE);
child = gtk_bin_get_child (&(window->bin)); child = gtk_bin_get_child (&(window->bin));
@ -6410,7 +6410,7 @@ gtk_window_guess_default_size (GtkWindow *window,
int minimum, natural; int minimum, natural;
widget = GTK_WIDGET (window); widget = GTK_WIDGET (window);
display = gdk_screen_get_display (_gtk_window_get_screen (window)); display = gtk_widget_get_display (widget);
gdkwindow = _gtk_widget_get_window (widget); gdkwindow = _gtk_widget_get_window (widget);
if (gdkwindow) if (gdkwindow)