Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed CocoaInternalIdle()

Browse Source 
* Removed methods that were called by wxTopLevelWindow notification handlers
* Removed now useless m_needMenuBar
* Added an Objective-C notification observer class
* Added methods to receive the notifications
* InstallMenuBarForWindow now takes a wxCocoaNSWindow
* Do not keep track of key/main window
* Keep track of window for which menu bar was installed (m_windowCurrent)
* SetMenuBar() will now install the main menu immediately


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-11-06 20:12:11 +00:00
parent a381cfaa2d
commit f1d04a42d5
2 changed files with 127 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/cocoa/mbarman.h
View File

@@ -16,6 +16,8 @@
#include "wx/toplevel.h"
DECLARE_WXCOCOA_OBJC_CLASS(wxMenuBarManagerObserver);
// ========================================================================
// wxMenuBarManager
// ========================================================================
@@ -41,28 +43,28 @@ protected:
// ------------------------------------------------------------------------
public:
void SetMainMenuBar(wxMenuBar* menubar);
void CocoaInternalIdle();
void WindowDidBecomeKey(wxTopLevelWindowNative *win);
void WindowDidResignKey(wxTopLevelWindowNative *win, bool uninstallMenuBar = true);
void WindowDidBecomeMain(wxTopLevelWindowNative *win);
void WindowDidResignMain(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 UpdateWindowMenuBar(wxTopLevelWindowNative *win);
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;
wxCocoaNSWindow *m_windowCurrent;
};
#endif // wxUSE_MENUS