]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/cocoa/mbarman.h
fix warnings in EventsSuppressor ctor from gcc with -O option
[wxWidgets.git] / include / wx / cocoa / mbarman.h
index a7947bde1b50763d7109484f31a52404b892d07a..70dc7d3d612e3baa299c7647be3d6158c63862c6 100644 (file)
@@ -50,7 +50,7 @@ public:
     void WindowDidResignMain(NSNotification *notification);
     void WindowWillClose(NSNotification *notification);
 #endif // 0
     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);
 protected:
     void SetMenuBar(wxMenuBar* menubar);
     void InstallMenuBarForWindow(wxCocoaNSWindow *win);
@@ -64,7 +64,7 @@ protected:
     // Main menu (if app provides one)
     wxMenuBar *m_mainMenuBar;
     wxMenuBarManagerObserver *m_observer;
     // Main menu (if app provides one)
     wxMenuBar *m_mainMenuBar;
     wxMenuBarManagerObserver *m_observer;
-    wxCocoaNSWindow *m_windowCurrent;
+    WX_NSWindow m_currentNSWindow;
 };
 
 #endif // wxUSE_MENUS
 };
 
 #endif // wxUSE_MENUS