diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-03 15:50:30 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-03 15:50:30 +0000 |
| commit | 8de7c8b76121ac968f674679a8a66e111fcb28a1 (patch) | |
| tree | ef3a38dc7339be1443eb5d4a604468d87fa7bb33 /gtk/gtktextlayout.c | |
| parent | 0351d5671ddf406de9cceb746e95a48a61be45be (diff) | |
| download | gtk+-8de7c8b76121ac968f674679a8a66e111fcb28a1.tar.gz | |
Fix a warning.
* gtk/gtktextlayout.c: Fix a warning.
* gtk/gtktextsegment.h:
* gtk/gtktextsegment.c:
* gtk/gtktextchild.c:
* gtk/gtktextbtree.c:
* gtk/gtktextmark.c:
* gtk/gtktexttypes.h: Make the segment class pointers const.
* gtk/gtktextbufferserialize.c: Make parser struct const.
* gtk/gtkuimanager.c: Make parser struct const.
Diffstat (limited to 'gtk/gtktextlayout.c')
| -rw-r--r-- | gtk/gtktextlayout.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index b46d1685ba..85ff8966e2 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1293,7 +1293,6 @@ set_para_values (GtkTextLayout *layout, pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); pango_layout_set_wrap (display->layout, PANGO_WRAP_CHAR); break; - case GTK_WRAP_WORD: layout_width = layout->screen_width - display->left_margin - display->right_margin; pango_layout_set_width (display->layout, layout_width * PANGO_SCALE); @@ -1329,14 +1328,14 @@ gtk_text_attr_appearance_copy (const PangoAttribute *attr) static void gtk_text_attr_appearance_destroy (PangoAttribute *attr) { - GtkTextAppearance *appearance = &((GtkTextAttrAppearance *)attr)->appearance; + GtkTextAttrAppearance *appearance_attr = (GtkTextAttrAppearance *)attr; - if (appearance->bg_stipple) - g_object_unref (appearance->bg_stipple); - if (appearance->fg_stipple) - g_object_unref (appearance->fg_stipple); + if (appearance_attr->appearance.bg_stipple) + g_object_unref (appearance_attr->appearance.bg_stipple); + if (appearance_attr->appearance.fg_stipple) + g_object_unref (appearance_attr->appearance.fg_stipple); - g_slice_free (GtkTextAttrAppearance, attr); + g_slice_free (GtkTextAttrAppearance, appearance_attr); } static gboolean |