]> git.eshelyaron.com Git - emacs.git/commit
Move NS port toolbar handling to the window
authorAlan Third <alan@idiocy.org>
Sat, 12 Jun 2021 11:52:15 +0000 (12:52 +0100)
committerAlan Third <alan@idiocy.org>
Sat, 31 Jul 2021 10:13:05 +0000 (11:13 +0100)
commit0b5cf4850990ff7b32264d2a174843fe72203cd0
treecdf5ca231a514f42eef6b5811a82c7310560edc4
parent1ba02d85a964e1b2c6a9735cd3decdc524e06dc1
Move NS port toolbar handling to the window

* src/nsmenu.m (free_frame_tool_bar):
(update_frame_tool_bar): Remove wait_for_tool_bar and get the toolbar
from the window.
* src/nsterm.h (EmacsView): Remove toolbar and wait_for_tool_bar.
* src/nsterm.m (ns_update_begin):
([EmacsView windowDidEnterFullScreen]):
([EmacsView windowDidExitFullScreen]): Get the toolbar from the
window, not the view.
([EmacsView dealloc]): Remove toolbar from view.
([EmacsView createToolbar:]): Move method to EmacsWindow.
([EmacsView initFrameFromEmacs:]): Don't create toolbar here any more.
([EmacsView toolbar]): Remove method.
([EmacsWindow initWithEmacsFrame:fullscreen:screen:]): Create toolbar here.
([EmacsWindow createToolbar:]): Moved from EmacsView.
([EmacsWindow dealloc]): Make sure we clean up the toolbar after
closing the window.
src/nsmenu.m
src/nsterm.h
src/nsterm.m