Renamed UpdateWindowMenuBar to UpdateMenuBar and removed unused parameter

[wxWidgets.git] / src / cocoa / toplevel.mm

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 5bcd9a84d8f821893ff4ed58324bd4917a8027f5..de8ad026619aa6b25bb09ef6c6f2163530a8cf63 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -134,11 +134,11 @@ wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
 // wxTopLevelWindowCocoa Cocoa Specifics
 // ----------------------------------------------------------------------------
 
-wxMenuBar* wxTopLevelWindowCocoa::GetAppMenuBar()
+wxMenuBar* wxTopLevelWindowCocoa::GetAppMenuBar(wxCocoaNSWindow *win)
 {
     wxTopLevelWindowCocoa *parent = wxDynamicCast(GetParent(),wxTopLevelWindow);
     if(parent)
-        return parent->GetAppMenuBar();
+        return parent->GetAppMenuBar(win);
     return NULL;
 }
 
@@ -167,7 +167,6 @@ void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newVie
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
 {
     wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
-    wxMenuBarManager::GetInstance()->WindowDidBecomeKey(this);
     wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
@@ -179,19 +178,16 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
     wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
-    wxMenuBarManager::GetInstance()->WindowDidResignKey(this);
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
 {
     wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);
-    wxMenuBarManager::GetInstance()->WindowDidBecomeMain(this);
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
 {
     wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
-    wxMenuBarManager::GetInstance()->WindowDidResignMain(this);
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)