From e0fee22e7885f465370c184c7e02d542ec16b177 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 22 Jan 2001 23:09:48 +0000 Subject: Add built marshaller files to support GdkPixbufLoader signals 2001-01-22 Havoc Pennington * Makefile.am: Add built marshaller files to support GdkPixbufLoader signals * gdk-pixbuf-io.c (gdk_pixbuf_load_module): have GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in module location, rather than acting as a fallback, because we are using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it. * gdk-pixbuf.h: include gdk-pixbuf-loader.h * gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here from gtk, and add error to close(), because stop_load may do parsing of the image. * pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file * io-*.c: make individual operations static, and add fill_vtable functions which are exported. Fix the collection of type warnings that surfaced, including a number of functions that didn't properly take a GError and some that weren't const-correct. Involved adding error handling for a few loaders. * gdk-pixbuf-io.h: Add error reporting to stop_load function * gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up a function that fills in the GdkPixbufModule vtable, instead of looking up all the image functions individually; this means we can get type safety within modules for the loader functions. Also it means you don't have to keep the statically compiled and GModule versions in sync. * test-gdk-pixbuf.c (main): remove gdk_pixbuf_init() * make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init() * gdk-pixbuf.h: nuke gdk_pixbuf_init() * gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init () here * gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here * gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type): g_type_init() here 2001-01-22 Havoc Pennington * demos/testanimation.c: fix to reflect gdk-pixbuf changes * demos/testpixbuf.c: fix to reflect gdk-pixbuf changes * gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h: Remove, move back to gdk-pixbuf * gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents to all the word functions * gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return before doing anything on NULL layout or if we don't have the focus * gtk/testtext.c (fill_example_buffer): "justification" * gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute to be called "justification" not "justify" * demos/gtk-demo/textview.c (create_tags): "justification" * gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping --- gtk/testtext.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'gtk/testtext.c') diff --git a/gtk/testtext.c b/gtk/testtext.c index 3086f0bdbd..9a66df2cb9 100644 --- a/gtk/testtext.c +++ b/gtk/testtext.c @@ -470,17 +470,17 @@ fill_example_buffer (GtkTextBuffer *buffer) color.blue = color.red = 0; color.green = 0xffff; g_object_set (G_OBJECT (tag), - "background_gdk", &color, - "size_points", 10.0, - NULL); + "background_gdk", &color, + "size_points", 10.0, + NULL); tag = gtk_text_buffer_create_tag (buffer, "strikethrough"); setup_tag (tag); g_object_set (G_OBJECT (tag), - "strikethrough", TRUE, - NULL); + "strikethrough", TRUE, + NULL); tag = gtk_text_buffer_create_tag (buffer, "underline"); @@ -488,30 +488,30 @@ fill_example_buffer (GtkTextBuffer *buffer) setup_tag (tag); g_object_set (G_OBJECT (tag), - "underline", PANGO_UNDERLINE_SINGLE, - NULL); + "underline", PANGO_UNDERLINE_SINGLE, + NULL); setup_tag (tag); g_object_set (G_OBJECT (tag), - "underline", PANGO_UNDERLINE_SINGLE, - NULL); + "underline", PANGO_UNDERLINE_SINGLE, + NULL); tag = gtk_text_buffer_create_tag (buffer, "centered"); g_object_set (G_OBJECT (tag), - "justify", GTK_JUSTIFY_CENTER, - NULL); + "justification", GTK_JUSTIFY_CENTER, + NULL); tag = gtk_text_buffer_create_tag (buffer, "rtl_quote"); g_object_set (G_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); #if 0 @@ -1182,6 +1182,9 @@ view_init_menus (View *view) case GTK_WRAPMODE_WORD: menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words"); break; + case GTK_WRAPMODE_CHAR: + menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Chars"); + break; default: break; } @@ -1208,6 +1211,7 @@ static GtkItemFactoryEntry menu_items[] = { "/_Settings", NULL, 0, 0, "" }, { "/Settings/Wrap _Off", NULL, do_wrap_changed, GTK_WRAPMODE_NONE, "" }, { "/Settings/Wrap _Words", NULL, do_wrap_changed, GTK_WRAPMODE_WORD, "/Settings/Wrap Off" }, + { "/Settings/Wrap _Chars", NULL, do_wrap_changed, GTK_WRAPMODE_CHAR, "/Settings/Wrap Off" }, { "/Settings/sep1", NULL, 0, 0, "" }, { "/Settings/Editable", NULL, do_editable_changed, TRUE, "" }, { "/Settings/Not editable", NULL, do_editable_changed, FALSE, "/Settings/Editable" }, -- cgit v1.2.1