From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 4 Nov 2006 03:08:35 +0000 (+0000)
Subject: * gtkutil.c (update_frame_tool_bar): If icon image is invalid and
X-Git-Tag: emacs-pretest-22.0.91~362
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ffbdf67b4c0bff0616b65d5365dc43a07f5d3f72;p=emacs.git

* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
	wicon is null, insert an empty button.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 73b654b920b..0d6f6838e8e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-03  Chong Yidong  <cyd@stupidchicken.com>
+
+	* gtkutil.c (update_frame_tool_bar): If icon image is invalid and
+	wicon is null, insert an empty button.
+
 2006-11-03  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* xterm.c (x_raise_frame): Send _NET_ACTIVE_WINDOW when raising the
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 07cc883fb83..f7b9f8c18f9 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3720,7 +3720,12 @@ update_frame_tool_bar (f)
 
       if (img->load_failed_p || img->pixmap == None)
         {
-          if (wicon) gtk_widget_hide (wicon);
+          if (wicon)
+	    gtk_widget_hide (wicon);
+	  else
+	    gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget),
+				gtk_tool_button_new (NULL, ""),
+				i);
           continue;
         }