From 3e6e7b94f620438fce28ac995dddbb8ca749f4a9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 26 Sep 2000 20:35:39 +0000 Subject: [PATCH] remove Fix some warnings 2000-09-26 Havoc Pennington * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove Fix some warnings --- ChangeLog | 71 ++++++++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-0 | 71 ++++++++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-10 | 71 ++++++++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-2 | 71 ++++++++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-4 | 71 ++++++++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-6 | 71 ++++++++++++++++++++++++++++++++++++++++++++ ChangeLog.pre-2-8 | 71 ++++++++++++++++++++++++++++++++++++++++++++ gtk/gtkiconfactory.c | 26 +--------------- 8 files changed, 498 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 329d1ec02..69bd445b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 329d1ec02..69bd445b5 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 329d1ec02..69bd445b5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 329d1ec02..69bd445b5 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 329d1ec02..69bd445b5 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 329d1ec02..69bd445b5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 329d1ec02..69bd445b5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,74 @@ +2000-09-26 Havoc Pennington + + * gtk/gtkiconfactory.c (gtk_icon_set_clear): remove + Fix some warnings + +2000-09-26 Havoc Pennington + + * gtk/Makefile.am (gtk_private_h_sources): Move more text widget + headers into the private header list + + * Makefile.am (pkgconfig_DATA): install pkg-config files + + * configure.in: add pkg-config files + + * gdk-2.0.pc.in, gdk-pixbuf.pc.in, gtk+-2.0.pc.in: pkg-config files + + * gtk/gtkwindow.c (gtk_window_read_rcfiles): Invalidate + outstanding icon caches on theme change. + + * gtk/gtkiconfactory.h, gtk/gtkiconfactory.c: New icon system. Three + important types: + + (GtkIconSource): Specification for creating a pixbuf + appropriate for a direction/state/size triplet from + a source pixbuf or filename + + (GtkIconSet): List of GtkIconSource objects that are used to + create the "same" icon (e.g. an OK button icon), and cache for + rendered icons + + (GtkIconFactory): Hash from stock ID to GtkIconSet; used to look + up the icon set for a given stock ID. GTK maintains a stack of + GtkIconFactory to search, and applications or libraries can add + additional icon factories on top of the stack + + * gtk/gtkrc.h, gtk/gtkrc.c: When loading an RcStyle, parse + the set of GtkIconSource specified for a given stock ID into + a GtkIconSet, and put the GtkIconSet into a GtkIconFactory for the + RcStyle, under the specified stock ID. + + * gtk/gtkstyle.h, gtk/gtkstyle.c: Add a virtual function + render_icon used to derive a GdkPixbuf from a GtkIconSource. + This allows people to theme how prelight, insensitive, etc. are + done. + + (gtk_style_lookup_icon_set): Look up a stock ID in the list of + icon factories for a style, and return the resulting + icon set if any. + + (gtk_style_render_icon): Render an icon using the render_icon + method in the GtkStyleClass. + + * gtk/gtkwidget.h, gtk/gtkwidget.c (gtk_widget_render_icon): + Use the style for a given widget to look up a stock ID, get the + icon set, and render an icon using the render_icon method + of the style + + * gtk/gtkstock.h, gtk/gtkstock.c: Header with the GtkStockItem type + (contains information about a stock item), the built-in stock item + IDs, and functions to add/lookup stock items. + + * gtk/stock-icons/*: Stock icons that come with GTK + + * gtk/gtkbutton.h, gtk/gtkbutton.c (gtk_button_new_stock): Returns + a button based on a GtkStockItem + (gtk_button_new_accel): Takes a uline string and accel group, and + installs the accelerator. + + * gtk/gtkimage.h, gtk/gtkimage.c: Make this into a generic + image-display widget. + 2000-09-25 Havoc Pennington * gtk/gtktextview.c: Draw the focus, and leave space to do so. diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 8924df75c..a7de61d2c 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -210,7 +210,7 @@ sized_icon_set_from_inline (const guchar *inline_data, GtkIconSource source = { NULL, NULL, 0, 0, NULL, TRUE, TRUE, FALSE }; - source.size = size; + source.size = (gchar*) size; set = gtk_icon_set_new (); @@ -417,8 +417,6 @@ init_icon_sizes (void) { if (icon_sizes == NULL) { - IconSize *is; - icon_sizes = g_hash_table_new (g_str_hash, g_str_equal); icon_size_add (GTK_ICON_SIZE_MENU, 16, 16); @@ -459,8 +457,6 @@ gtk_icon_size_register (const gchar *alias, gint width, gint height) { - gpointer old_key, old_value; - g_return_if_fail (alias != NULL); g_return_if_fail (width > 0); g_return_if_fail (height > 0); @@ -489,8 +485,6 @@ gtk_icon_size_register_alias (const gchar *alias, * GdkPixbuf objects and forget all GtkIconSources. Used to * recycle an icon set. */ -static void gtk_icon_set_clear (GtkIconSet *icon_set); - static GdkPixbuf *find_in_cache (GtkIconSet *icon_set, GtkStyle *style, GtkTextDirection direction, @@ -833,24 +827,6 @@ gtk_icon_source_free (GtkIconSource *source) g_free (source); } -void -gtk_icon_set_clear (GtkIconSet *icon_set) -{ - GSList *tmp_list; - - g_return_if_fail (icon_set != NULL); - - tmp_list = icon_set->sources; - while (tmp_list != NULL) - { - gtk_icon_source_free (tmp_list->data); - - tmp_list = g_slist_next (tmp_list); - } - - clear_cache (icon_set, TRUE); -} - /* Note that the logical maximum is 20 per GtkTextDirection, so we could * eventually set this to >20 to never throw anything out. */