* xdisp.c (update_menu_bar): Set w->update_mode_line to Qt

  so tool bar gets updated.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ce230558969aef33d0482eabd9cb405af9dfd98..d04286bc795e29ad2766f8259a85c3cc44bd71c6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-26  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xdisp.c (update_menu_bar): Set w->update_mode_line to Qt
+       so tool bar gets updated.
+
 2003-03-26  Stefan Monnier  <monnier@cs.yale.edu>
 
        * data.c (store_symval_forwarding): Re-instate part of the code

diff --git a/src/xdisp.c b/src/xdisp.c
index 718ef1702d0cdb72c39c7203edfb74703da939c0..32c8475707244e334d89c2076cc8d99c4ff1e6cc 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7905,11 +7905,16 @@ update_menu_bar (f, save_match_data)
   window = FRAME_SELECTED_WINDOW (f);
   w = XWINDOW (window);
 
-#if 0 /* The if statement below this if statement used to include the
+#if 1 /* The if statement below this if statement used to include the
          condition !NILP (w->update_mode_line), rather than using
          update_mode_lines directly, and this if statement may have
          been added to make that condition work.  Now the if
          statement below matches its comment, this isn't needed.  */
+  /* We need to set w->update_mode_line to Qt so that update_tool_bar
+     rebuilds tool bar items.  For example, to notice when a tool bar item
+     goes from enabled to disabled state.
+     A better way would be to notice tool bar, menu bar and mode line
+     changes separately, but for now update_mode_line is all we got.  */
   if (update_mode_lines)
     w->update_mode_line = Qt;
 #endif