diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-06-26 04:58:33 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-06-26 04:58:33 +0000 |
| commit | 957743919b207e532649e1bfda112dc34dc4ca7b (patch) | |
| tree | 142b69afa0a3b39471f3a91ef92e72902e1e8326 /gtk/gtkiconfactory.c | |
| parent | e1a243138a6f15785319b857d18049c78a07fba4 (diff) | |
| download | gtk+-957743919b207e532649e1bfda112dc34dc4ca7b.tar.gz | |
Accept a NULL style.
Sat Jun 26 00:40:02 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconfactory.c (render_icon_name_pixbuf):
* gtk/gtkiconfactory.c (gtk_icon_set_render_icon):
* gtk/gtkstyle.c (gtk_default_render_icon): Accept a NULL
style.
Diffstat (limited to 'gtk/gtkiconfactory.c')
| -rw-r--r-- | gtk/gtkiconfactory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index b1accbc006..52b50e8642 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1595,7 +1595,7 @@ render_icon_name_pixbuf (GtkIconSource *icon_source, if (widget && gtk_widget_has_screen (widget)) screen = gtk_widget_get_screen (widget); - else if (style->colormap) + else if (style && style->colormap) screen = gdk_colormap_get_screen (style->colormap); else { @@ -1768,7 +1768,7 @@ gtk_icon_set_render_icon (GtkIconSet *icon_set, GdkPixbuf *icon; g_return_val_if_fail (icon_set != NULL, NULL); - g_return_val_if_fail (GTK_IS_STYLE (style), 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); |