callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't prematurely mark window as realized

Browse Source 
Other code assumes that the widget has a window if it is realized.
Since we might trigger such code indirectly from gtk_window_realize,
don't mark the window as realized before we've registered its window.
This commit is contained in:
Matthias Clasen
2013-07-05 17:15:31 -04:00
parent 6bcf8a2584
commit ffadfbf322
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkwindow.c
View File

@ -5708,8 +5708,6 @@ gtk_window_realize (GtkWidget *widget)
{ {
gtk_container_set_resize_mode (GTK_CONTAINER (widget), GTK_RESIZE_PARENT); gtk_container_set_resize_mode (GTK_CONTAINER (widget), GTK_RESIZE_PARENT);
gtk_widget_set_realized (widget, TRUE);
attributes.x = allocation.x; attributes.x = allocation.x;
attributes.y = allocation.y; attributes.y = allocation.y;
attributes.width = allocation.width; attributes.width = allocation.width;
@ -5727,6 +5725,7 @@ gtk_window_realize (GtkWidget *widget)
&attributes, attributes_mask); &attributes, attributes_mask);
gtk_widget_set_window (widget, gdk_window); gtk_widget_set_window (widget, gdk_window);
gtk_widget_register_window (widget, gdk_window); gtk_widget_register_window (widget, gdk_window);
gtk_widget_set_realized (widget, TRUE);
return; return;
} }
@ -5760,9 +5759,7 @@ gtk_window_realize (GtkWidget *widget)
g_return_if_fail (!gtk_widget_get_realized (widget)); g_return_if_fail (!gtk_widget_get_realized (widget));
} }
gtk_widget_set_realized (widget, TRUE);
switch (priv->type) switch (priv->type)
{ {
case GTK_WINDOW_TOPLEVEL: case GTK_WINDOW_TOPLEVEL:
@ -5811,6 +5808,7 @@ gtk_window_realize (GtkWidget *widget)
gdk_window = gdk_window_new (parent_window, &attributes, attributes_mask); gdk_window = gdk_window_new (parent_window, &attributes, attributes_mask);
gtk_widget_set_window (widget, gdk_window); gtk_widget_set_window (widget, gdk_window);
gtk_widget_register_window (widget, gdk_window); gtk_widget_register_window (widget, gdk_window);
gtk_widget_set_realized (widget, TRUE);
/* We don't need to set a background on the GdkWindow; with decorations /* We don't need to set a background on the GdkWindow; with decorations
* we draw the background ourself * we draw the background ourself