diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-11-14 01:08:28 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-11-14 01:08:28 +0000 |
| commit | 73a00eeb447d40a6ed53ac57c482e4d1cb9483f3 (patch) | |
| tree | 2b047070821790df0a34f712590ece91a64a14b3 /gtk/testtext.c | |
| parent | f15049bd0241241c6865d9405a331ef1694ace56 (diff) | |
| download | gdk-pixbuf-73a00eeb447d40a6ed53ac57c482e4d1cb9483f3.tar.gz | |
fix bug where GC didn't always get updated properly
2000-11-13 Havoc Pennington <hp@redhat.com>
* gtk/gtktextdisplay.c (gtk_text_render_state_update): fix bug
where GC didn't always get updated properly
* demos/gtk-demo/textview.c (create_tags): Use subattributes
of fonts instead of setting the entire font
* gtk/testtext.c (fill_example_buffer): Use "size" instead of
setting entire font
* gtk/gtkdialog.c (gtk_dialog_add_button): Fix some warnings
* gtk/gtktexttag.h, gtk/gtktexttag.c: Explode font_desc into
a bunch of individually-settable font attributes. You can still
use the "font" and "font_desc" args, they just set all the font
attributes at once.
Diffstat (limited to 'gtk/testtext.c')
| -rw-r--r-- | gtk/testtext.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gtk/testtext.c b/gtk/testtext.c index ec964bcf9..9e52f2f97 100644 --- a/gtk/testtext.c +++ b/gtk/testtext.c @@ -444,7 +444,7 @@ fill_example_buffer (GtkTextBuffer *buffer) gtk_object_set (GTK_OBJECT (tag), "foreground_gdk", &color, "background_gdk", &color2, - "font", "Sans 24", + "size_points", 24.0, NULL); tag = gtk_text_buffer_create_tag (buffer, "fg_red"); @@ -465,17 +465,17 @@ fill_example_buffer (GtkTextBuffer *buffer) color.blue = color.red = 0; color.green = 0xffff; gtk_object_set (GTK_OBJECT (tag), - "background_gdk", &color, - "font", "Sans 10", - NULL); + "background_gdk", &color, + "size_points", 10.0, + NULL); tag = gtk_text_buffer_create_tag (buffer, "strikethrough"); setup_tag (tag); gtk_object_set (GTK_OBJECT (tag), - "strikethrough", TRUE, - NULL); + "strikethrough", TRUE, + NULL); tag = gtk_text_buffer_create_tag (buffer, "underline"); @@ -483,30 +483,30 @@ fill_example_buffer (GtkTextBuffer *buffer) setup_tag (tag); gtk_object_set (GTK_OBJECT (tag), - "underline", PANGO_UNDERLINE_SINGLE, - NULL); + "underline", PANGO_UNDERLINE_SINGLE, + NULL); setup_tag (tag); gtk_object_set (GTK_OBJECT (tag), - "underline", PANGO_UNDERLINE_SINGLE, - NULL); + "underline", PANGO_UNDERLINE_SINGLE, + NULL); tag = gtk_text_buffer_create_tag (buffer, "centered"); gtk_object_set (GTK_OBJECT (tag), - "justify", GTK_JUSTIFY_CENTER, - NULL); + "justify", GTK_JUSTIFY_CENTER, + NULL); tag = gtk_text_buffer_create_tag (buffer, "rtl_quote"); gtk_object_set (GTK_OBJECT (tag), - "wrap_mode", GTK_WRAPMODE_WORD, - "direction", GTK_TEXT_DIR_RTL, - "indent", 30, - "left_margin", 20, - "right_margin", 20, - NULL); + "wrap_mode", GTK_WRAPMODE_WORD, + "direction", GTK_TEXT_DIR_RTL, + "indent", 30, + "left_margin", 20, + "right_margin", 20, + NULL); pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm); |