Mercurial > emacs

changeset 109091:b4da23aa9b59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add BLOCK/UNBLOCK_INPUT so asserts don't trigger.
author Jan D <jan.h.d@swipnet.se>
date Thu, 01 Jul 2010 12:45:26 +0200
parents 4de0b34e2c2e
children babf8e935ea8
files src/ChangeLog src/nsmenu.m
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jul 01 01:32:01 2010 -0400
+++ b/src/ChangeLog	Thu Jul 01 12:45:26 2010 +0200
@@ -1,3 +1,8 @@
+2010-07-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
+	BLOCK/UNBLOCK_INPUT so asserts don't trigger.
+
 2010-06-30  Chong Yidong  <cyd@stupidchicken.com>
 
 	* frame.c (get_future_frame_param, Fmake_terminal_frame): Don't
--- a/src/nsmenu.m	Thu Jul 01 01:32:01 2010 -0400
+++ b/src/nsmenu.m	Thu Jul 01 12:45:26 2010 +0200
@@ -999,7 +999,9 @@
     Under NS we just hide the toolbar until it might be needed again.
    -------------------------------------------------------------------------- */
 {
+  BLOCK_INPUT;
   [[FRAME_NS_VIEW (f) toolbar] setVisible: NO];
+  UNBLOCK_INPUT;
 }
 
 void
@@ -1011,6 +1013,7 @@
   int i;
   EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar];
 
+  BLOCK_INPUT;
   [toolbar clearActive];
 
   /* update EmacsToolbar as in GtkUtils, build items list */
@@ -1094,6 +1097,7 @@
       [newDict release];
     }
 
+  UNBLOCK_INPUT;
 }