Commit 1f984e12 authored by Jan D's avatar Jan D

* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add

BLOCK/UNBLOCK_INPUT so asserts don't trigger.
parent b32d1614
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
......
......@@ -999,7 +999,9 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
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 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
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 @@ - (Lisp_Object)runMenuAt: (NSPoint)p forFrame: (struct frame *)f
[newDict release];
}
UNBLOCK_INPUT;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment