From 0b7418572ee7a8d900a315e67fcb12a56e21459b Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 26 Jun 2001 08:34:26 +0000 Subject: hm, second attempt. it's fight CVS time again. Tue Jun 26 09:48:02 2001 Tim Janik * Makefile.am (noinst_PROGRAMS): get rid of make-inline-pixbuf * gdk-pixbuf-data.[hc]: provide gdk_pixbuf_new_from_stream() instead from gdk_pixbuf_new_from_inline(). * gdk-pixdata.[hc]: auxillary GdkPixdata structure, public installed API for applications that need to serialize/deserialize on their own (gimp, BEAST). * gdk-pixbuf/gdk-pixbuf-csource.c: provide publically installed program that can dump images in CSource format and Pixbuf stream format. supports RLE encoding, MACRO formatting etc... invoke with --help. Tue Jun 26 10:04:30 2001 Tim Janik * gtk/gtkiconfactory.c: * gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs actually work. --- gtk/gtkitemfactory.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gtk/gtkitemfactory.h') diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 536d4ea7be..5132f9d1db 100644 --- a/gtk/gtkitemfactory.h +++ b/gtk/gtkitemfactory.h @@ -99,22 +99,24 @@ struct _GtkItemFactoryEntry * "" -> "" * "" -> create a title item * "<Item>" -> create a simple item + * "<ImageItem>" -> create an item holding an image + * "<StockItem>" -> create an item holding a stock image * "<CheckItem>" -> create a check item * "<ToggleItem>" -> create a toggle item * "<RadioItem>" -> create a radio item * <path> -> path of a radio item to link against * "<Separator>" -> create a separator + * "<Tearoff>" -> create a tearoff separator * "<Branch>" -> create an item to hold sub items * "<LastBranch>" -> create a right justified item to hold sub items */ gchar *item_type; /* Extra data for some item types: - * ImageItem -> pointer to inline pixbuf + inline pixbuf length + * ImageItem -> pointer to inlined pixbuf stream * StockItem -> name of stock item */ - gpointer extra_data; - guint extra_data2; + gconstpointer extra_data; }; struct _GtkItemFactoryItem -- cgit v1.2.1