use wcs(n)casecmp() if available; use wxStricmp() to implement wxString::CmpNoCase...

[wxWidgets.git] / include / wx / cocoa / mbarman.h

diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h
index f21dac789953c7b494385e48ad4b82f8f897b1c8..fd6d826da5f4e4a78ac3492d1ee4014405530bf4 100644 (file)
--- 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