X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/268bec5aee1a39b1d69e2d149a071c7b7c3a15dc..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/cocoa/mbarman.h diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h index f21dac7899..fd6d826da5 100644 --- a/include/wx/cocoa/mbarman.h +++ b/include/wx/cocoa/mbarman.h @@ -16,10 +16,12 @@ #include "wx/toplevel.h" +DECLARE_WXCOCOA_OBJC_CLASS(wxMenuBarManagerObserver); + // ======================================================================== // wxMenuBarManager // ======================================================================== -class WXDLLEXPORT wxMenuBarManager : public wxObject +class WXDLLIMPEXP_CORE wxMenuBarManager : public wxObject { // ------------------------------------------------------------------------ // initialization/destruction @@ -41,28 +43,28 @@ protected: // ------------------------------------------------------------------------ public: void SetMainMenuBar(wxMenuBar* menubar); - void CocoaInternalIdle(); - void WindowDidBecomeKey(wxTopLevelWindowNative *win); - void WindowDidResignKey(wxTopLevelWindowNative *win); - void WindowDidBecomeMain(wxTopLevelWindowNative *win); - void WindowDidResignMain(wxTopLevelWindowNative *win); - void UpdateWindowMenuBar(wxTopLevelWindowNative *win); + void WindowDidBecomeKey(NSNotification *notification); +#if 0 + void WindowDidResignKey(NSNotification *notification); + void WindowDidBecomeMain(NSNotification *notification); + void WindowDidResignMain(NSNotification *notification); + void WindowWillClose(NSNotification *notification); +#endif // 0 + void UpdateMenuBar(); protected: void SetMenuBar(wxMenuBar* menubar); - void InstallMenuBarForWindow(wxTopLevelWindowNative *win); + void InstallMenuBarForWindow(wxCocoaNSWindow *win); void InstallMainMenu(); WX_NSMenu m_menuApp; WX_NSMenu m_menuServices; WX_NSMenu m_menuWindows; WX_NSMenu m_menuMain; - // Some menu bar needs to be installed - bool m_needMenuBar; // Is main menu bar the current one bool m_mainMenuBarInstalled; // Main menu (if app provides one) wxMenuBar *m_mainMenuBar; - wxTopLevelWindowNative *m_windowKey; - wxTopLevelWindowNative *m_windowMain; + wxMenuBarManagerObserver *m_observer; + WX_NSWindow m_currentNSWindow; }; #endif // wxUSE_MENUS