forked from AuroraMiddleware/gtk
widget: Don't call gtk_style_attach() and gtk_style_detach() anymore
This commit is contained in:
parent
080ae55e87
commit
1891b790b3
@ -7807,14 +7807,8 @@ gtk_widget_get_parent (GtkWidget *widget)
|
|||||||
void
|
void
|
||||||
gtk_widget_style_attach (GtkWidget *widget)
|
gtk_widget_style_attach (GtkWidget *widget)
|
||||||
{
|
{
|
||||||
GtkWidgetPrivate *priv;
|
|
||||||
|
|
||||||
g_return_if_fail (GTK_IS_WIDGET (widget));
|
g_return_if_fail (GTK_IS_WIDGET (widget));
|
||||||
g_return_if_fail (gtk_widget_get_realized (widget));
|
g_return_if_fail (gtk_widget_get_realized (widget));
|
||||||
|
|
||||||
priv = widget->priv;
|
|
||||||
|
|
||||||
priv->style = gtk_style_attach (priv->style, priv->window);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -10736,7 +10730,6 @@ gtk_widget_real_realize (GtkWidget *widget)
|
|||||||
priv->window = gtk_widget_get_parent_window (widget);
|
priv->window = gtk_widget_get_parent_window (widget);
|
||||||
g_object_ref (priv->window);
|
g_object_ref (priv->window);
|
||||||
}
|
}
|
||||||
priv->style = gtk_style_attach (priv->style, priv->window);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************
|
/*****************************************
|
||||||
@ -10768,7 +10761,6 @@ gtk_widget_real_unrealize (GtkWidget *widget)
|
|||||||
(GtkCallback) gtk_widget_unrealize,
|
(GtkCallback) gtk_widget_unrealize,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gtk_style_detach (priv->style);
|
|
||||||
if (gtk_widget_get_has_window (widget))
|
if (gtk_widget_get_has_window (widget))
|
||||||
{
|
{
|
||||||
gdk_window_set_user_data (priv->window, NULL);
|
gdk_window_set_user_data (priv->window, NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user