Don't pass notifications to wxMenuBarManager. It will be getting its own.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -167,7 +167,6 @@ void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newVie
|
|||||||
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
|
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
|
||||||
{
|
{
|
||||||
wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
|
wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
|
||||||
wxMenuBarManager::GetInstance()->WindowDidBecomeKey(this);
|
|
||||||
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
|
wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
|
||||||
event.SetEventObject(this);
|
event.SetEventObject(this);
|
||||||
GetEventHandler()->ProcessEvent(event);
|
GetEventHandler()->ProcessEvent(event);
|
||||||
@@ -179,19 +178,16 @@ void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
|
|||||||
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
|
wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
|
||||||
event.SetEventObject(this);
|
event.SetEventObject(this);
|
||||||
GetEventHandler()->ProcessEvent(event);
|
GetEventHandler()->ProcessEvent(event);
|
||||||
wxMenuBarManager::GetInstance()->WindowDidResignKey(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
|
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
|
||||||
{
|
{
|
||||||
wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);
|
wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);
|
||||||
wxMenuBarManager::GetInstance()->WindowDidBecomeMain(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
|
void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
|
||||||
{
|
{
|
||||||
wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
|
wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
|
||||||
wxMenuBarManager::GetInstance()->WindowDidResignMain(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)
|
void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)
|
||||||
|
Reference in New Issue
Block a user