diff options
| author | Tim Janik <timj@gtk.org> | 2001-06-26 08:34:26 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-06-26 08:34:26 +0000 |
| commit | 0b7418572ee7a8d900a315e67fcb12a56e21459b (patch) | |
| tree | 0bdc0446657458a9df2a26a12f1a037a0396a476 /gtk/gtkitemfactory.c | |
| parent | bf0d61a59b9e1b889ba98b36b05a90e76f64eced (diff) | |
| download | gdk-pixbuf-0b7418572ee7a8d900a315e67fcb12a56e21459b.tar.gz | |
hm, second attempt. it's fight CVS time again.
Tue Jun 26 09:48:02 2001 Tim Janik <timj@gtk.org>
* 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 <timj@gtk.org>
* gtk/gtkiconfactory.c:
* gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up
item factory so inlined pixbufs actually work.
Diffstat (limited to 'gtk/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index ff3b8cdd4..b47970e76 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -228,8 +228,8 @@ gtk_item_factory_class_init (GtkItemFactoryClass *class) quark_type_toggle_item = g_quark_from_static_string ("<ToggleItem>"); quark_type_image_item = g_quark_from_static_string ("<ImageItem>"); quark_type_stock_item = g_quark_from_static_string ("<StockItem>"); - quark_type_tearoff_item = g_quark_from_static_string ("<Tearoff>"); quark_type_separator_item = g_quark_from_static_string ("<Separator>"); + quark_type_tearoff_item = g_quark_from_static_string ("<Tearoff>"); quark_type_branch = g_quark_from_static_string ("<Branch>"); quark_type_last_branch = g_quark_from_static_string ("<LastBranch>"); } @@ -1228,14 +1228,14 @@ gtk_item_factory_create_item (GtkItemFactory *ifactory, gtk_radio_menu_item_set_group (GTK_RADIO_MENU_ITEM (widget), radio_group); if (GTK_IS_CHECK_MENU_ITEM (widget)) gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (widget), TRUE); - if (GTK_IS_IMAGE_MENU_ITEM (widget)) + if (type_id == quark_type_image_item) { GdkPixbuf *pixbuf = NULL; image = NULL; - pixbuf = gdk_pixbuf_new_from_inline (entry->extra_data, + pixbuf = gdk_pixbuf_new_from_stream (-1, + entry->extra_data, FALSE, - entry->extra_data2, NULL); if (pixbuf) |