Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept a NULL style.

Browse Source 
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.
This commit is contained in:
Matthias Clasen
2004-06-26 04:58:33 +00:00
committed by Matthias Clasen
parent e1a243138a
commit 957743919b
6 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
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.
Sat Jun 26 00:04:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (gtk_entry_completion_set_model):

7
ChangeLog.pre-2-10
View File

@@ -1,3 +1,10 @@
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.
Sat Jun 26 00:04:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (gtk_entry_completion_set_model):

7
ChangeLog.pre-2-6
View File

@@ -1,3 +1,10 @@
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.
Sat Jun 26 00:04:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (gtk_entry_completion_set_model):

7
ChangeLog.pre-2-8
View File

@@ -1,3 +1,10 @@
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.
Sat Jun 26 00:04:36 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (gtk_entry_completion_set_model):

4
gtk/gtkiconfactory.c
View File

@@ -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);

2
gtk/gtkstyle.c
View File

@@ -2164,7 +2164,7 @@ gtk_default_render_icon (GtkStyle *style,
screen = gtk_widget_get_screen (widget);
settings = gtk_settings_get_for_screen (screen);
}
else if (style->colormap)
else if (style && style->colormap)
{
screen = gdk_colormap_get_screen (style->colormap);
settings = gtk_settings_get_for_screen (screen);