diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-04-04 18:32:24 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-04-04 18:32:24 +0200 |
| commit | 11a9c72fafaa02ef26708da6ffe765a7fdaa4565 (patch) | |
| tree | e20e6c51747a69be7e81daa1ab1be642a7981043 /src/nsterm.h | |
| parent | 97bac2112e7b4332834900863810370a57e38fbe (diff) | |
| download | emacs-11a9c72fafaa02ef26708da6ffe765a7fdaa4565.tar.gz | |
Backport from trunk.
* nsmenu.m (update_frame_tool_bar): Return early if view or toolbar
is nil. If waiting for toolbar to complete, force a redraw.
(free_frame_tool_bar): Set wait_for_tool_bar = NO
* nsterm.h (EmacsView): Add wait_for_tool_bar.
* nsterm.m (updateFrameSize:): If waiting for the tool bar and tool
bar is zero height, just return (Bug#16976).
(initFrameFromEmacs:): Initialize wait_for_tool_bar.
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index 8e8a9b7f36f..74789634a90 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -162,6 +162,7 @@ typedef float EmacsCGFloat; int scrollbarsNeedingUpdate; EmacsToolbar *toolbar; NSRect ns_userRect; + BOOL wait_for_tool_bar; } /* AppKit-side interface */ |