Mercurial > dwindows

changeset 255:a167001c56df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check that _find_pixmap() returns a pixmap handle before packing the result into the tree item. (GTK 1.x)
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 20 Feb 2003 17:48:08 +0000
parents 42332e598d55
children 63d68387d924
files gtk/dw.c
diffstat 1 files changed, 18 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/gtk/dw.c	Thu Feb 20 11:21:47 2003 +0000
+++ b/gtk/dw.c	Thu Feb 20 17:48:08 2003 +0000
@@ -3500,16 +3500,15 @@
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_object_set_data(GTK_OBJECT(newitem), "hbox", (gpointer)hbox);
 	gdkpix = _find_pixmap(&gdkbmp, icon, hbox, NULL, NULL);
-#if GTK_MAJOR_VERSION > 1
-	pixmap = gtk_image_new_from_pixmap(gdkpix, gdkbmp);
-#else
-	pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
-#endif
 	gtk_container_add(GTK_CONTAINER(newitem), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
+	if(gdkpix)
+	{
+		pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
+		gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
+		gtk_widget_show(pixmap);
+	}
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
 	gtk_widget_show(label);
-	gtk_widget_show(pixmap);
 	gtk_widget_show(hbox);
 
 	if(parent)
@@ -3619,16 +3618,15 @@
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_object_set_data(GTK_OBJECT(item), "hbox", (gpointer)hbox);
 	gdkpix = _find_pixmap(&gdkbmp, icon, hbox, NULL, NULL);
-#if GTK_MAJOR_VERSION > 1
-	pixmap = gtk_image_new_from_pixmap(gdkpix, gdkbmp);
-#else
-	pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
-#endif
 	gtk_container_add(GTK_CONTAINER(item), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
+	if(gdkpix)
+	{
+		pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
+		gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
+		gtk_widget_show(pixmap);
+	}
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
 	gtk_widget_show(label);
-	gtk_widget_show(pixmap);
 	gtk_widget_show(hbox);
 
 	if(parent)
@@ -3726,16 +3724,15 @@
 	hbox = gtk_hbox_new(FALSE, 2);
 	gtk_object_set_data(GTK_OBJECT(item), "hbox", (gpointer)hbox);
 	gdkpix = _find_pixmap(&gdkbmp, icon, hbox, NULL, NULL);
-#if GTK_MAJOR_VERSION > 1
-	pixmap = gtk_image_new_from_pixmap(gdkpix, gdkbmp);
-#else
-	pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
-#endif
 	gtk_container_add(GTK_CONTAINER(item), hbox);
-	gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
+	if(gdkpix)
+	{
+		pixmap = gtk_pixmap_new(gdkpix, gdkbmp);
+		gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, TRUE, 0);
+		gtk_widget_show(pixmap);
+	}
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0);
 	gtk_widget_show(label);
-	gtk_widget_show(pixmap);
 	gtk_widget_show(hbox);
 	DW_MUTEX_UNLOCK;
 #endif