diff options
| author | Jan D | 2010-07-01 12:45:26 +0200 |
|---|---|---|
| committer | Jan D | 2010-07-01 12:45:26 +0200 |
| commit | 1f984e12b46da4e8758b8c547cd90d5dac72a1fd (patch) | |
| tree | 48bd385c006194753398c9f5d5dfdef725b208e5 /src/nsmenu.m | |
| parent | b32d1614abd91e784a95a34b9979b7ec0c541c9e (diff) | |
| download | emacs-1f984e12b46da4e8758b8c547cd90d5dac72a1fd.tar.gz emacs-1f984e12b46da4e8758b8c547cd90d5dac72a1fd.zip | |
* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Add
BLOCK/UNBLOCK_INPUT so asserts don't trigger.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index f85ebc165af..5fc3d0f5a41 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -999,7 +999,9 @@ free_frame_tool_bar (FRAME_PTR f) | |||
| 999 | Under NS we just hide the toolbar until it might be needed again. | 999 | Under NS we just hide the toolbar until it might be needed again. |
| 1000 | -------------------------------------------------------------------------- */ | 1000 | -------------------------------------------------------------------------- */ |
| 1001 | { | 1001 | { |
| 1002 | BLOCK_INPUT; | ||
| 1002 | [[FRAME_NS_VIEW (f) toolbar] setVisible: NO]; | 1003 | [[FRAME_NS_VIEW (f) toolbar] setVisible: NO]; |
| 1004 | UNBLOCK_INPUT; | ||
| 1003 | } | 1005 | } |
| 1004 | 1006 | ||
| 1005 | void | 1007 | void |
| @@ -1011,6 +1013,7 @@ update_frame_tool_bar (FRAME_PTR f) | |||
| 1011 | int i; | 1013 | int i; |
| 1012 | EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar]; | 1014 | EmacsToolbar *toolbar = [FRAME_NS_VIEW (f) toolbar]; |
| 1013 | 1015 | ||
| 1016 | BLOCK_INPUT; | ||
| 1014 | [toolbar clearActive]; | 1017 | [toolbar clearActive]; |
| 1015 | 1018 | ||
| 1016 | /* update EmacsToolbar as in GtkUtils, build items list */ | 1019 | /* update EmacsToolbar as in GtkUtils, build items list */ |
| @@ -1094,6 +1097,7 @@ update_frame_tool_bar (FRAME_PTR f) | |||
| 1094 | [newDict release]; | 1097 | [newDict release]; |
| 1095 | } | 1098 | } |
| 1096 | 1099 | ||
| 1100 | UNBLOCK_INPUT; | ||
| 1097 | } | 1101 | } |
| 1098 | 1102 | ||
| 1099 | 1103 | ||