diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtkaccellabel.c | 11 |
5 files changed, 18 insertions, 5 deletions
@@ -1,5 +1,8 @@ 2004-11-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Don't + access label->layout directly. (#157080, Adam Hooper) + * gtk/gtklabel.c (gtk_label_set_pattern_internal): Allow unsetting a pattern by passing NULL. (#156720, Tristan Van Berkom) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 03fa58ae92..763d8421bf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-11-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Don't + access label->layout directly. (#157080, Adam Hooper) + * gtk/gtklabel.c (gtk_label_set_pattern_internal): Allow unsetting a pattern by passing NULL. (#156720, Tristan Van Berkom) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 03fa58ae92..763d8421bf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-11-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Don't + access label->layout directly. (#157080, Adam Hooper) + * gtk/gtklabel.c (gtk_label_set_pattern_internal): Allow unsetting a pattern by passing NULL. (#156720, Tristan Van Berkom) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 03fa58ae92..763d8421bf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-11-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkaccellabel.c (gtk_accel_label_expose_event): Don't + access label->layout directly. (#157080, Adam Hooper) + * gtk/gtklabel.c (gtk_label_set_pattern_internal): Allow unsetting a pattern by passing NULL. (#156720, Tristan Van Berkom) diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 73b27e52a5..ab0ce47dc8 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -325,12 +325,14 @@ gtk_accel_label_expose_event (GtkWidget *widget, gint x; gint y; + label_layout = gtk_label_get_layout (GTK_LABEL (accel_label)); + if (direction == GTK_TEXT_DIR_RTL) widget->allocation.x += ac_width; widget->allocation.width -= ac_width; if (gtk_label_get_ellipsize (label)) - pango_layout_set_width (label->layout, - pango_layout_get_width (label->layout) + pango_layout_set_width (label_layout, + pango_layout_get_width (label_layout) - ac_width * PANGO_SCALE); if (GTK_WIDGET_CLASS (parent_class)->expose_event) @@ -339,8 +341,8 @@ gtk_accel_label_expose_event (GtkWidget *widget, widget->allocation.x -= ac_width; widget->allocation.width += ac_width; if (gtk_label_get_ellipsize (label)) - pango_layout_set_width (label->layout, - pango_layout_get_width (label->layout) + pango_layout_set_width (label_layout, + pango_layout_get_width (label_layout) + ac_width * PANGO_SCALE); if (direction == GTK_TEXT_DIR_RTL) @@ -348,7 +350,6 @@ gtk_accel_label_expose_event (GtkWidget *widget, else x = widget->allocation.x + widget->allocation.width - misc->xpad - ac_width; - label_layout = gtk_label_get_layout (GTK_LABEL (accel_label)); gtk_label_get_layout_offsets (GTK_LABEL (accel_label), NULL, &y); accel_layout = gtk_widget_create_pango_layout (widget, gtk_accel_label_get_string (accel_label)); |