Revert the last change, since gtk_widget_set_style_internal() already

2005-02-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c (gtk_label_style_set): Revert the last
	change, since gtk_widget_set_style_internal() already
	queues a resize.
This commit is contained in:
Matthias Clasen 2005-02-24 13:39:47 +00:00 committed by Matthias Clasen
parent 14fefb8617
commit 09239601fd
4 changed files with 21 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2005-02-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Revert the last
change, since gtk_widget_set_style_internal() already
queues a resize.
2005-02-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since

View File

@ -1,3 +1,9 @@
2005-02-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Revert the last
change, since gtk_widget_set_style_internal() already
queues a resize.
2005-02-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since

View File

@ -1,3 +1,9 @@
2005-02-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Revert the last
change, since gtk_widget_set_style_internal() already
queues a resize.
2005-02-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtklabel.c (gtk_label_style_set): Queue a resize, since

View File

@ -2008,6 +2008,7 @@ gtk_label_size_request (GtkWidget *widget,
requisition->width = width + rect.width;
requisition->height = height + rect.height;
return;
}
else
@ -2081,8 +2082,10 @@ gtk_label_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkLabel *label;
GtkLabelPrivate *priv;
label = GTK_LABEL (widget);
priv = GTK_LABEL_GET_PRIVATE (widget);
(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
@ -2129,7 +2132,6 @@ gtk_label_style_set (GtkWidget *widget,
/* We have to clear the layout, fonts etc. may have changed */
gtk_label_clear_layout (label);
gtk_widget_queue_resize (GTK_WIDGET (label));
}
static void