X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkiconfactory.c;h=b40267335b0a78c0a1ec613de399e2a2422de375;hb=bda5987335b8c7828ebf1d289a91accfe2e74dbe;hp=c5ae553a2ac964810c53ef6b1349d6eee3729dfe;hpb=29a758d4c267efc3d8beb7329cb9e831627764f2;p=~andy%2Fgtk diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index c5ae553a2..b40267335 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* @@ -25,24 +23,128 @@ */ #include "config.h" + #include #include #include + #include "gtkiconfactory.h" #include "gtkiconcache.h" #include "gtkdebug.h" #include "gtkicontheme.h" -#include "gtksettings.h" +#include "gtksettingsprivate.h" #include "gtkstock.h" #include "gtkwidget.h" #include "gtkintl.h" #include "gtkbuildable.h" #include "gtkbuilderprivate.h" +#include "gtktypebuiltins.h" +#include "deprecated/gtkstyle.h" + + +/** + * SECTION:gtkiconfactory + * @Short_description: Manipulating stock icons + * @Title: Themeable Stock Images + * + * Browse the available stock icons in the list of stock IDs found here. You can also use + * the gtk-demo application for this purpose. + * + * An icon factory manages a collection of #GtkIconSet; a #GtkIconSet manages a + * set of variants of a particular icon (i.e. a #GtkIconSet contains variants for + * different sizes and widget states). Icons in an icon factory are named by a + * stock ID, which is a simple string identifying the icon. Each #GtkStyle has a + * list of #GtkIconFactory derived from the current theme; those icon factories + * are consulted first when searching for an icon. If the theme doesn't set a + * particular icon, GTK+ looks for the icon in a list of default icon factories, + * maintained by gtk_icon_factory_add_default() and + * gtk_icon_factory_remove_default(). Applications with icons should add a default + * icon factory with their icons, which will allow themes to override the icons + * for the application. + * + * To display an icon, always use gtk_style_lookup_icon_set() on the widget that + * will display the icon, or the convenience function + * gtk_widget_render_icon(). These functions take the theme into account when + * looking up the icon to use for a given stock ID. + * + * + * GtkIconFactory as GtkBuildable + * + * GtkIconFactory supports a custom <sources> element, which can contain + * multiple <source> elements. + * The following attributes are allowed: + * + * + * stock-id + * + * The stock id of the source, a string. + * This attribute is mandatory + * + * + * + * filename + * + * The filename of the source, a string. + * This attribute is optional + * + * + * + * icon-name + * + * The icon name for the source, a string. + * This attribute is optional. + * + * + * + * size + * + * Size of the icon, a #GtkIconSize enum value. + * This attribute is optional. + * + * + * + * direction + * + * Direction of the source, a #GtkTextDirection enum value. + * This attribute is optional. + * + * + * + * state + * + * State of the source, a #GtkStateType enum value. + * This attribute is optional. + * + * + * + * + * A #GtkIconFactory UI definition fragment. + * + * + * + * + * + * + * + * + * apple-red + * True + * + * + * + * ]]> + * + * + * + * + */ static GSList *all_icon_factories = NULL; -struct _GtkIconFactoryPriv +struct _GtkIconFactoryPrivate { GHashTable *icons; }; @@ -78,13 +180,6 @@ struct _GtkIconSource guint any_direction : 1; guint any_state : 1; guint any_size : 1; - -#if defined (G_OS_WIN32) && !defined (_WIN64) - /* System codepage version of filename, for DLL ABI backward - * compatibility functions. - */ - gchar *cp_filename; -#endif }; @@ -122,11 +217,11 @@ G_DEFINE_TYPE_WITH_CODE (GtkIconFactory, gtk_icon_factory, G_TYPE_OBJECT, static void gtk_icon_factory_init (GtkIconFactory *factory) { - GtkIconFactoryPriv *priv; + GtkIconFactoryPrivate *priv; factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, GTK_TYPE_ICON_FACTORY, - GtkIconFactoryPriv); + GtkIconFactoryPrivate); priv = factory->priv; priv->icons = g_hash_table_new (g_str_hash, g_str_equal); @@ -140,7 +235,7 @@ gtk_icon_factory_class_init (GtkIconFactoryClass *klass) object_class->finalize = gtk_icon_factory_finalize; - g_type_class_add_private (klass, sizeof (GtkIconFactoryPriv)); + g_type_class_add_private (klass, sizeof (GtkIconFactoryPrivate)); } static void @@ -161,7 +256,7 @@ static void gtk_icon_factory_finalize (GObject *object) { GtkIconFactory *factory = GTK_ICON_FACTORY (object); - GtkIconFactoryPriv *priv = factory->priv; + GtkIconFactoryPrivate *priv = factory->priv; all_icon_factories = g_slist_remove (all_icon_factories, factory); @@ -219,7 +314,7 @@ gtk_icon_factory_add (GtkIconFactory *factory, const gchar *stock_id, GtkIconSet *icon_set) { - GtkIconFactoryPriv *priv = factory->priv; + GtkIconFactoryPrivate *priv = factory->priv; gpointer old_key = NULL; gpointer old_value = NULL; @@ -256,13 +351,13 @@ gtk_icon_factory_add (GtkIconFactory *factory, * widget that will display the icon, instead of using this * function directly, so that themes are taken into account. * - * Return value: icon set of @stock_id. + * Return value: (transfer none): icon set of @stock_id. */ GtkIconSet * gtk_icon_factory_lookup (GtkIconFactory *factory, const gchar *stock_id) { - GtkIconFactoryPriv *priv; + GtkIconFactoryPrivate *priv; g_return_val_if_fail (GTK_IS_ICON_FACTORY (factory), NULL); g_return_val_if_fail (stock_id != NULL, NULL); @@ -272,7 +367,6 @@ gtk_icon_factory_lookup (GtkIconFactory *factory, return g_hash_table_lookup (priv->icons, stock_id); } -static GtkIconFactory *gtk_default_icons = NULL; static GSList *default_factories = NULL; /** @@ -314,15 +408,32 @@ gtk_icon_factory_remove_default (GtkIconFactory *factory) g_object_unref (factory); } -void -_gtk_icon_factory_ensure_default_icons (void) +static GtkIconFactory * +_gtk_icon_factory_get_default_icons (void) { - if (gtk_default_icons == NULL) - { - gtk_default_icons = gtk_icon_factory_new (); + static GtkIconFactory *default_icons = NULL; + GtkIconFactory *icons = NULL; + GdkScreen *screen = gdk_screen_get_default (); + + if (screen) + icons = g_object_get_data (G_OBJECT (screen), "gtk-default-icons"); - get_default_icons (gtk_default_icons); + if (icons == NULL) + { + if (default_icons == NULL) + { + default_icons = gtk_icon_factory_new (); + get_default_icons (default_icons); + } + if (screen) + g_object_set_data_full (G_OBJECT (screen), + I_("gtk-default-icons"), + default_icons, + g_object_unref); + icons = default_icons; } + + return icons; } /** @@ -335,12 +446,13 @@ _gtk_icon_factory_ensure_default_icons (void) * using this function directly, so that themes are taken into * account. * - * Return value: a #GtkIconSet, or %NULL + * Return value: (transfer none): a #GtkIconSet, or %NULL */ GtkIconSet * gtk_icon_factory_lookup_default (const gchar *stock_id) { GSList *tmp_list; + GtkIconFactory *default_icons; g_return_val_if_fail (stock_id != NULL, NULL); @@ -357,9 +469,11 @@ gtk_icon_factory_lookup_default (const gchar *stock_id) tmp_list = g_slist_next (tmp_list); } - _gtk_icon_factory_ensure_default_icons (); - - return gtk_icon_factory_lookup (gtk_default_icons, stock_id); + default_icons = _gtk_icon_factory_get_default_icons (); + if (default_icons) + return gtk_icon_factory_lookup (default_icons, stock_id); + else + return NULL; } static void @@ -453,7 +567,7 @@ get_default_icons (GtkIconFactory *factory) register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE); register_stock_icon (factory, GTK_STOCK_PAGE_SETUP, GTK_STOCK_PAGE_SETUP); register_stock_icon (factory, GTK_STOCK_PASTE, "edit-paste"); - register_stock_icon (factory, GTK_STOCK_PREFERENCES, "edit-preferences"); + register_stock_icon (factory, GTK_STOCK_PREFERENCES, GTK_STOCK_PREFERENCES); register_stock_icon (factory, GTK_STOCK_PRINT, "document-print"); register_stock_icon (factory, GTK_STOCK_PRINT_ERROR, "printer-error"); register_stock_icon (factory, GTK_STOCK_PRINT_PAUSED, "printer-paused"); @@ -486,7 +600,7 @@ get_default_icons (GtkIconFactory *factory) register_bidi_stock_icon (factory, GTK_STOCK_UNDELETE, GTK_STOCK_UNDELETE); register_bidi_stock_icon (factory, GTK_STOCK_UNDO, "edit-undo"); register_stock_icon (factory, GTK_STOCK_GO_UP, "go-up"); - register_stock_icon (factory, GTK_STOCK_FILE, "document-x-generic"); + register_stock_icon (factory, GTK_STOCK_FILE, "text-x-generic"); register_stock_icon (factory, GTK_STOCK_DIRECTORY, "folder"); register_stock_icon (factory, GTK_STOCK_ABOUT, "help-about"); register_stock_icon (factory, GTK_STOCK_CONNECT, GTK_STOCK_CONNECT); @@ -803,7 +917,7 @@ icon_size_settings_changed (GtkSettings *settings, { icon_size_set_all_from_settings (settings); - gtk_rc_reset_styles (settings); + gtk_style_context_reset_widgets (_gtk_settings_get_screen (settings)); } static void @@ -872,14 +986,14 @@ icon_size_lookup_intern (GtkSettings *settings, * @settings: a #GtkSettings object, used to determine * which set of user preferences to used. * @size: (type int): an icon size - * @width: location to store icon width - * @height: location to store icon height + * @width: (out): location to store icon width + * @height: (out): location to store icon height * * Obtains the pixel size of a semantic icon size, possibly * modified by user preferences for a particular * #GtkSettings. Normally @size would be * #GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_BUTTON, etc. This function - * isn't normally needed, gtk_widget_render_icon() is the usual + * isn't normally needed, gtk_widget_render_icon_pixbuf() is the usual * way to get an icon for rendering, then just look at the size of * the rendered pixbuf. The rendered pixbuf may not even correspond to * the width/height returned by gtk_icon_size_lookup(), because themes @@ -904,15 +1018,15 @@ gtk_icon_size_lookup_for_settings (GtkSettings *settings, /** * gtk_icon_size_lookup: * @size: (type int): an icon size - * @width: location to store icon width - * @height: location to store icon height + * @width: (out): location to store icon width + * @height: (out): location to store icon height * * Obtains the pixel size of a semantic icon size, possibly * modified by user preferences for the default #GtkSettings. * (See gtk_icon_size_lookup_for_settings().) * Normally @size would be * #GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_BUTTON, etc. This function - * isn't normally needed, gtk_widget_render_icon() is the usual + * isn't normally needed, gtk_widget_render_icon_pixbuf() is the usual * way to get an icon for rendering, then just look at the size of * the rendered pixbuf. The rendered pixbuf may not even correspond to * the width/height returned by gtk_icon_size_lookup(), because themes @@ -1070,12 +1184,13 @@ gtk_icon_size_from_name (const gchar *name) /** * gtk_icon_size_get_name: * @size: (type int): a #GtkIconSize. - * @returns: the name of the given icon size. * * Gets the canonical name of the given icon size. The returned string * is statically allocated and should not be freed. + * + * Returns: the name of the given icon size. */ -G_CONST_RETURN gchar* +const gchar* gtk_icon_size_get_name (GtkIconSize size) { if (size >= icon_sizes_used) @@ -1090,12 +1205,12 @@ gtk_icon_size_get_name (GtkIconSize size) static GdkPixbuf *find_in_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size); static void add_to_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size, @@ -1109,9 +1224,9 @@ static void clear_cache (GtkIconSet *icon_set, static GSList* copy_cache (GtkIconSet *icon_set, GtkIconSet *copy_recipient); static void attach_to_style (GtkIconSet *icon_set, - GtkStyle *style); + GtkStyleContext *style_context); static void detach_from_style (GtkIconSet *icon_set, - GtkStyle *style); + GtkStyleContext *style_context); static void style_dnotify (gpointer data); struct _GtkIconSet @@ -1138,7 +1253,7 @@ static guint cache_serial = 0; * for a given size and state on request, and automatically caches * some of the rendered #GdkPixbuf objects. * - * Normally you would use gtk_widget_render_icon() instead of + * Normally you would use gtk_widget_render_icon_pixbuf() instead of * using #GtkIconSet directly. The one case where you'd use * #GtkIconSet is to create application-specific icon sets to place in * a #GtkIconFactory. @@ -1360,7 +1475,7 @@ ensure_filename_pixbuf (GtkIconSet *icon_set, /* Remove this icon source so we don't keep trying to * load it. */ - g_warning (_("Error loading icon: %s"), error->message); + g_warning ("Error loading icon: %s", error->message); g_error_free (error); icon_set->sources = g_slist_remove (icon_set->sources, source); @@ -1376,12 +1491,8 @@ ensure_filename_pixbuf (GtkIconSet *icon_set, static GdkPixbuf * render_icon_name_pixbuf (GtkIconSource *icon_source, - GtkStyle *style, - GtkTextDirection direction, - GtkStateType state, - GtkIconSize size, - GtkWidget *widget, - const char *detail) + GtkStyleContext *context, + GtkIconSize size) { GdkPixbuf *pixbuf; GdkPixbuf *tmp_pixbuf; @@ -1393,17 +1504,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, gint *sizes, *s, dist; GError *error = NULL; - if (widget && gtk_widget_has_screen (widget)) - screen = gtk_widget_get_screen (widget); - else if (style && style->colormap) - screen = gdk_colormap_get_screen (style->colormap); - else - { - screen = gdk_screen_get_default (); - GTK_NOTE (MULTIHEAD, - g_warning ("Using the default screen for gtk_icon_source_render_icon()")); - } - + screen = gtk_style_context_get_screen (context); icon_theme = gtk_icon_theme_get_for_screen (screen); settings = gtk_settings_get_for_screen (screen); @@ -1468,8 +1569,10 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, if (info) { tmp_pixbuf = gtk_icon_info_load_icon (info, &error); - gtk_icon_info_free (info); + g_object_unref (info); } + else + tmp_pixbuf = NULL; } else { @@ -1492,9 +1595,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, tmp_source.type = GTK_ICON_SOURCE_PIXBUF; tmp_source.source.pixbuf = tmp_pixbuf; - pixbuf = gtk_style_render_icon (style, &tmp_source, - direction, state, -1, - widget, detail); + pixbuf = gtk_render_icon_pixbuf (context, &tmp_source, -1); if (!pixbuf) g_warning ("Failed to render icon"); @@ -1506,12 +1607,10 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, static GdkPixbuf * find_and_render_icon_source (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *context, GtkTextDirection direction, GtkStateType state, - GtkIconSize size, - GtkWidget *widget, - const char *detail) + GtkIconSize size) { GSList *failed = NULL; GdkPixbuf *pixbuf = NULL; @@ -1540,9 +1639,7 @@ find_and_render_icon_source (GtkIconSet *icon_set, break; /* Fall through */ case GTK_ICON_SOURCE_PIXBUF: - pixbuf = gtk_style_render_icon (style, source, - direction, state, size, - widget, detail); + pixbuf = gtk_render_icon_pixbuf (context, source, size); if (!pixbuf) { g_warning ("Failed to render icon"); @@ -1551,9 +1648,7 @@ find_and_render_icon_source (GtkIconSet *icon_set, break; case GTK_ICON_SOURCE_ICON_NAME: case GTK_ICON_SOURCE_STATIC_ICON_NAME: - pixbuf = render_icon_name_pixbuf (source, style, - direction, state, size, - widget, detail); + pixbuf = render_icon_name_pixbuf (source, context, size); if (!pixbuf) failed = g_slist_prepend (failed, source); break; @@ -1570,12 +1665,10 @@ find_and_render_icon_source (GtkIconSet *icon_set, extern GtkIconCache *_builtin_cache; static GdkPixbuf* -render_fallback_image (GtkStyle *style, +render_fallback_image (GtkStyleContext *context, GtkTextDirection direction, GtkStateType state, - GtkIconSize size, - GtkWidget *widget, - const char *detail) + GtkIconSize size) { /* This icon can be used for any direction/state/size */ static GtkIconSource fallback_source = GTK_ICON_SOURCE_INIT (TRUE, TRUE, TRUE); @@ -1588,20 +1681,79 @@ render_fallback_image (GtkStyle *style, _gtk_icon_theme_ensure_builtin_cache (); index = _gtk_icon_cache_get_directory_index (_builtin_cache, "24"); - pixbuf = _gtk_icon_cache_get_icon (_builtin_cache, - GTK_STOCK_MISSING_IMAGE, - index); + pixbuf = _gtk_icon_cache_get_icon (_builtin_cache, "image-missing", index); + + g_return_val_if_fail(pixbuf != NULL, NULL); + gtk_icon_source_set_pixbuf (&fallback_source, pixbuf); g_object_unref (pixbuf); } - return gtk_style_render_icon (style, - &fallback_source, - direction, - state, - size, - widget, - detail); + return gtk_render_icon_pixbuf (context, &fallback_source, size); +} + +/** + * gtk_icon_set_render_icon_pixbuf: + * @icon_set: a #GtkIconSet + * @context: a #GtkStyleContext + * @size: (type int): icon size. A size of (GtkIconSize)-1 + * means render at the size of the source and don't scale. + * + * Renders an icon using gtk_render_icon_pixbuf(). In most cases, + * gtk_widget_render_icon_pixbuf() is better, since it automatically provides + * most of the arguments from the current widget settings. This + * function never returns %NULL; if the icon can't be rendered + * (perhaps because an image file fails to load), a default "missing + * image" icon will be returned instead. + * + * Return value: (transfer full): a #GdkPixbuf to be displayed + * + * Since: 3.0 + */ +GdkPixbuf * +gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set, + GtkStyleContext *context, + GtkIconSize size) +{ + GdkPixbuf *icon = NULL; + GtkStateFlags flags = 0; + GtkStateType state; + GtkTextDirection direction; + + g_return_val_if_fail (icon_set != NULL, NULL); + g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), NULL); + + flags = gtk_style_context_get_state (context); + if (flags & GTK_STATE_FLAG_INSENSITIVE) + state = GTK_STATE_INSENSITIVE; + else if (flags & GTK_STATE_FLAG_PRELIGHT) + state = GTK_STATE_PRELIGHT; + else + state = GTK_STATE_NORMAL; + +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + direction = gtk_style_context_get_direction (context); +G_GNUC_END_IGNORE_DEPRECATIONS; + + if (icon_set->sources) + { + icon = find_in_cache (icon_set, context, direction, state, size); + if (icon) + { + g_object_ref (icon); + return icon; + } + } + + if (icon_set->sources) + icon = find_and_render_icon_source (icon_set, context, direction, state, size); + + if (icon == NULL) + icon = render_fallback_image (context, direction, state, size); + + add_to_cache (icon_set, context, direction, state, size, icon); + + return icon; } /** @@ -1626,7 +1778,9 @@ render_fallback_image (GtkStyle *style, * (perhaps because an image file fails to load), a default "missing * image" icon will be returned instead. * - * Return value: a #GdkPixbuf to be displayed + * Return value: (transfer full): a #GdkPixbuf to be displayed + * + * Deprecated: 3.0: Use gtk_icon_set_render_icon_pixbuf() instead */ GdkPixbuf* gtk_icon_set_render_icon (GtkIconSet *icon_set, @@ -1638,34 +1792,49 @@ gtk_icon_set_render_icon (GtkIconSet *icon_set, const char *detail) { GdkPixbuf *icon; + GtkStyleContext *context = NULL; + GtkStateFlags flags = 0; g_return_val_if_fail (icon_set != NULL, NULL); g_return_val_if_fail (style == NULL || GTK_IS_STYLE (style), NULL); - if (icon_set->sources == NULL) - return render_fallback_image (style, direction, state, size, widget, detail); - - if (detail == NULL) + if (style && gtk_style_has_context (style)) { - icon = find_in_cache (icon_set, style, direction, - state, size); - - if (icon) - { - g_object_ref (icon); - return icon; - } + g_object_get (style, "context", &context, NULL); + /* g_object_get returns a refed object */ + if (context) + g_object_unref (context); + } + else if (widget) + { + context = gtk_widget_get_style_context (widget); } + if (!context) + return render_fallback_image (context, direction, state, size); - icon = find_and_render_icon_source (icon_set, style, direction, state, size, - widget, detail); + gtk_style_context_save (context); - if (icon == NULL) - icon = render_fallback_image (style, direction, state, size, widget, detail); + switch (state) + { + case GTK_STATE_PRELIGHT: + flags |= GTK_STATE_FLAG_PRELIGHT; + break; + case GTK_STATE_INSENSITIVE: + flags |= GTK_STATE_FLAG_INSENSITIVE; + break; + default: + break; + } + + gtk_style_context_set_state (context, flags); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + gtk_style_context_set_direction (context, direction); +G_GNUC_END_IGNORE_DEPRECATIONS; + + icon = gtk_icon_set_render_icon_pixbuf (icon_set, context, size); - if (detail == NULL) - add_to_cache (icon_set, style, direction, state, size, icon); + gtk_style_context_restore (context); return icon; } @@ -1907,9 +2076,6 @@ gtk_icon_source_copy (const GtkIconSource *source) break; case GTK_ICON_SOURCE_FILENAME: copy->source.filename = g_strdup (copy->source.filename); -#if defined (G_OS_WIN32) && !defined (_WIN64) - copy->cp_filename = g_strdup (copy->cp_filename); -#endif if (copy->filename_pixbuf) g_object_ref (copy->filename_pixbuf); break; @@ -1959,10 +2125,6 @@ icon_source_clear (GtkIconSource *source) case GTK_ICON_SOURCE_FILENAME: g_free (source->source.filename); source->source.filename = NULL; -#if defined (G_OS_WIN32) && !defined (_WIN64) - g_free (source->cp_filename); - source->cp_filename = NULL; -#endif if (source->filename_pixbuf) g_object_unref (source->filename_pixbuf); source->filename_pixbuf = NULL; @@ -1981,7 +2143,7 @@ icon_source_clear (GtkIconSource *source) /** * gtk_icon_source_set_filename: * @source: a #GtkIconSource - * @filename: image file to use + * @filename: (type filename): image file to use * * Sets the name of an image file to use as a base image when creating * icon variants for #GtkIconSet. The filename must be absolute. @@ -2003,14 +2165,11 @@ gtk_icon_source_set_filename (GtkIconSource *source, { source->type = GTK_ICON_SOURCE_FILENAME; source->source.filename = g_strdup (filename); -#if defined (G_OS_WIN32) && !defined (_WIN64) - source->cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL); -#endif } } /** - * gtk_icon_source_set_icon_name + * gtk_icon_source_set_icon_name: * @source: a #GtkIconSource * @icon_name: (allow-none): name of icon to use * @@ -2072,10 +2231,10 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source, * filename is not a copy, and should not be modified or expected to * persist beyond the lifetime of the icon source. * - * Return value: image filename. This string must not be modified - * or freed. + * Return value: (type filename): image filename. This string must not + * be modified or freed. */ -G_CONST_RETURN gchar* +const gchar* gtk_icon_source_get_filename (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); @@ -2096,7 +2255,7 @@ gtk_icon_source_get_filename (const GtkIconSource *source) * * Return value: icon name. This string must not be modified or freed. */ -G_CONST_RETURN gchar* +const gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); @@ -2120,7 +2279,7 @@ gtk_icon_source_get_icon_name (const GtkIconSource *source) * virtual function. The reference count on the pixbuf is * not incremented. * - * Return value: source pixbuf + * Return value: (transfer none): source pixbuf */ GdkPixbuf* gtk_icon_source_get_pixbuf (const GtkIconSource *source) @@ -2391,7 +2550,7 @@ struct _CachedIcon /* These must all match to use the cached pixbuf. * If any don't match, we must re-render the pixbuf. */ - GtkStyle *style; + GtkStyleContext *style; GtkTextDirection direction; GtkStateType state; GtkIconSize size; @@ -2413,16 +2572,14 @@ static void cached_icon_free (CachedIcon *icon) { g_object_unref (icon->pixbuf); - - if (icon->style) - g_object_unref (icon->style); + g_object_unref (icon->style); g_free (icon); } static GdkPixbuf * find_in_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size) @@ -2438,7 +2595,7 @@ find_in_cache (GtkIconSet *icon_set, { CachedIcon *icon = tmp_list->data; - if (icon->style == style && + if (icon->style == style_context && icon->direction == direction && icon->state == state && (size == (GtkIconSize)-1 || icon->size == size)) @@ -2463,7 +2620,7 @@ find_in_cache (GtkIconSet *icon_set, static void add_to_cache (GtkIconSet *icon_set, - GtkStyle *style, + GtkStyleContext *style_context, GtkTextDirection direction, GtkStateType state, GtkIconSize size, @@ -2475,26 +2632,16 @@ add_to_cache (GtkIconSet *icon_set, g_object_ref (pixbuf); - /* We have to ref the style, since if the style was finalized - * its address could be reused by another style, creating a - * really weird bug - */ - - if (style) - g_object_ref (style); - icon = g_new (CachedIcon, 1); icon_set->cache = g_slist_prepend (icon_set->cache, icon); icon_set->cache_size++; - icon->style = style; + icon->style = g_object_ref (style_context); icon->direction = direction; icon->state = state; icon->size = size; icon->pixbuf = pixbuf; - - if (icon->style) - attach_to_style (icon_set, icon->style); + attach_to_style (icon_set, icon->style); if (icon_set->cache_size >= NUM_CACHED_ICONS) { @@ -2527,7 +2674,7 @@ clear_cache (GtkIconSet *icon_set, gboolean style_detach) { GSList *cache, *tmp_list; - GtkStyle *last_style = NULL; + GtkStyleContext *last_style = NULL; cache = icon_set->cache; icon_set->cache = NULL; @@ -2576,11 +2723,8 @@ copy_cache (GtkIconSet *icon_set, *icon_copy = *icon; - if (icon_copy->style) - { - attach_to_style (copy_recipient, icon_copy->style); - g_object_ref (icon_copy->style); - } + attach_to_style (copy_recipient, icon_copy->style); + g_object_ref (icon_copy->style); g_object_ref (icon_copy->pixbuf); @@ -2595,18 +2739,18 @@ copy_cache (GtkIconSet *icon_set, } static void -attach_to_style (GtkIconSet *icon_set, - GtkStyle *style) +attach_to_style (GtkIconSet *icon_set, + GtkStyleContext *style_context) { GHashTable *table; - table = g_object_get_qdata (G_OBJECT (style), + table = g_object_get_qdata (G_OBJECT (style_context), g_quark_try_string ("gtk-style-icon-sets")); if (table == NULL) { table = g_hash_table_new (NULL, NULL); - g_object_set_qdata_full (G_OBJECT (style), + g_object_set_qdata_full (G_OBJECT (style_context), g_quark_from_static_string ("gtk-style-icon-sets"), table, style_dnotify); @@ -2616,12 +2760,12 @@ attach_to_style (GtkIconSet *icon_set, } static void -detach_from_style (GtkIconSet *icon_set, - GtkStyle *style) +detach_from_style (GtkIconSet *icon_set, + GtkStyleContext *style_context) { GHashTable *table; - table = g_object_get_qdata (G_OBJECT (style), + table = g_object_get_qdata (G_OBJECT (style_context), g_quark_try_string ("gtk-style-icon-sets")); if (table != NULL) @@ -2679,14 +2823,14 @@ _gtk_icon_factory_list_ids (void) ids = NULL; - _gtk_icon_factory_ensure_default_icons (); + _gtk_icon_factory_get_default_icons (); tmp_list = all_icon_factories; while (tmp_list != NULL) { GList *these_ids; GtkIconFactory *factory = GTK_ICON_FACTORY (tmp_list->data); - GtkIconFactoryPriv *priv = factory->priv; + GtkIconFactoryPrivate *priv = factory->priv; these_ids = g_hash_table_get_keys (priv->icons); @@ -2714,12 +2858,12 @@ typedef struct { } IconSourceParserData; static void -icon_source_start_element (GMarkupParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, - gpointer user_data, - GError **error) +icon_source_start_element (GMarkupParseContext *context, + const gchar *element_name, + const gchar **names, + const gchar **values, + gpointer user_data, + GError **error) { gint i; gchar *stock_id = NULL; @@ -2738,63 +2882,63 @@ icon_source_start_element (GMarkupParseContext *context, if (!parser_data->in_source) { if (strcmp (element_name, "sources") != 0) - { - error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); - error_domain = GTK_BUILDER_ERROR_INVALID_TAG; - goto error; - } + { + error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); + error_domain = GTK_BUILDER_ERROR_INVALID_TAG; + goto error; + } parser_data->in_source = TRUE; return; } else { if (strcmp (element_name, "source") != 0) - { - error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); - error_domain = GTK_BUILDER_ERROR_INVALID_TAG; - goto error; - } + { + error_msg = g_strdup_printf ("Unexpected element %s, expected ", element_name); + error_domain = GTK_BUILDER_ERROR_INVALID_TAG; + goto error; + } } for (i = 0; names[i]; i++) { if (strcmp (names[i], "stock-id") == 0) - stock_id = g_strdup (values[i]); + stock_id = g_strdup (values[i]); else if (strcmp (names[i], "filename") == 0) - filename = g_strdup (values[i]); + filename = g_strdup (values[i]); else if (strcmp (names[i], "icon-name") == 0) - icon_name = g_strdup (values[i]); + icon_name = g_strdup (values[i]); else if (strcmp (names[i], "size") == 0) - { + { if (!_gtk_builder_enum_from_string (GTK_TYPE_ICON_SIZE, values[i], &size, error)) - return; - } + return; + } else if (strcmp (names[i], "direction") == 0) - { + { if (!_gtk_builder_enum_from_string (GTK_TYPE_TEXT_DIRECTION, values[i], &direction, error)) - return; - } + return; + } else if (strcmp (names[i], "state") == 0) - { + { if (!_gtk_builder_enum_from_string (GTK_TYPE_STATE_TYPE, values[i], &state, error)) - return; - } + return; + } else - { - error_msg = g_strdup_printf ("'%s' is not a valid attribute of <%s>", - names[i], "source"); - error_domain = GTK_BUILDER_ERROR_INVALID_ATTRIBUTE; - goto error; - } + { + error_msg = g_strdup_printf ("'%s' is not a valid attribute of <%s>", + names[i], "source"); + error_domain = GTK_BUILDER_ERROR_INVALID_ATTRIBUTE; + goto error; + } } if (!stock_id) @@ -2820,20 +2964,11 @@ icon_source_start_element (GMarkupParseContext *context, gchar *tmp; gint line_number, char_number; - g_markup_parse_context_get_position (context, - &line_number, - &char_number); + g_markup_parse_context_get_position (context, &line_number, &char_number); tmp = g_strdup_printf ("%s:%d:%d %s", "input", - line_number, char_number, error_msg); -#if 0 - g_set_error_literal (error, - GTK_BUILDER_ERROR, - error_domain, - tmp); -#else - g_warning ("%s", tmp); -#endif + line_number, char_number, error_msg); + g_set_error_literal (error, GTK_BUILDER_ERROR, error_domain, tmp); g_free (tmp); g_free (stock_id); g_free (filename); @@ -2948,35 +3083,3 @@ gtk_icon_factory_buildable_custom_tag_end (GtkBuildable *buildable, gtk_icon_factory_add_default (icon_factory); } } - -#if defined (G_OS_WIN32) && !defined (_WIN64) - -/* DLL ABI stability backward compatibility versions */ - -#undef gtk_icon_source_set_filename - -void -gtk_icon_source_set_filename (GtkIconSource *source, - const gchar *filename) -{ - gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, NULL); - - gtk_icon_source_set_filename_utf8 (source, utf8_filename); - - g_free (utf8_filename); -} - -#undef gtk_icon_source_get_filename - -G_CONST_RETURN gchar* -gtk_icon_source_get_filename (const GtkIconSource *source) -{ - g_return_val_if_fail (source != NULL, NULL); - - if (source->type == GTK_ICON_SOURCE_FILENAME) - return source->cp_filename; - else - return NULL; -} - -#endif