Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h
index a7947bde1b50763d7109484f31a52404b892d07a..0223cb5c74e883572cfb77edd2f6ddaeb5d42d3d 100644 (file)
--- a/include/wx/cocoa/mbarman.h
+++ b/include/wx/cocoa/mbarman.h
@@ -4,7 +4,6 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/09/04
-// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -21,7 +20,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(wxMenuBarManagerObserver);
 // ========================================================================
 // wxMenuBarManager
 // ========================================================================
-class WXDLLEXPORT wxMenuBarManager : public wxObject
+class WXDLLIMPEXP_CORE wxMenuBarManager : public wxObject
 {
 // ------------------------------------------------------------------------
 // initialization/destruction
@@ -50,7 +49,7 @@ public:
     void WindowDidResignMain(NSNotification *notification);
     void WindowWillClose(NSNotification *notification);
 #endif // 0
-    void UpdateWindowMenuBar(wxTopLevelWindowNative *win);
+    void UpdateMenuBar();
 protected:
     void SetMenuBar(wxMenuBar* menubar);
     void InstallMenuBarForWindow(wxCocoaNSWindow *win);
@@ -64,7 +63,7 @@ protected:
     // Main menu (if app provides one)
     wxMenuBar *m_mainMenuBar;
     wxMenuBarManagerObserver *m_observer;
-    wxCocoaNSWindow *m_windowCurrent;
+    WX_NSWindow m_currentNSWindow;
 };
 
 #endif // wxUSE_MENUS