AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 00:11:29 +00:00
Code Issues Projects Releases Wiki Activity

widget: Make gtk_widget_real_realize() stricter

Browse Source 
But in turn, also allow it to work on widgets with their own surface.

This way, we can chain up from everywhere and won't have to export
gtk_widget_set_realized().
This commit is contained in:
Benjamin Otte 2018-04-11 02:38:00 +02:00
parent 0af5316f00
commit 5c51a302a4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwidget.c
View File

@ -8755,14 +8755,18 @@ gtk_widget_real_realize (GtkWidget *widget)
{ {
GtkWidgetPrivate *priv = widget->priv; GtkWidgetPrivate *priv = widget->priv;
g_assert (!_gtk_widget_get_has_surface (widget)); if (_gtk_widget_get_has_surface (widget))
gtk_widget_set_realized (widget, TRUE);
if (priv->parent)
{ {
g_assert (priv->surface != NULL);
}
else
{
g_assert (priv->parent);
priv->surface = gtk_widget_get_parent_surface (widget); priv->surface = gtk_widget_get_parent_surface (widget);
g_object_ref (priv->surface); g_object_ref (priv->surface);
} }
gtk_widget_set_realized (widget, TRUE);
} }
/***************************************** /*****************************************