From 243f5c2d917b77474b6d159fc338ec669d70cc91 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Thu, 13 Nov 2003 14:23:07 +0000
Subject: [PATCH] Renamed UpdateWindowMenuBar to UpdateMenuBar and removed
unused parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/cocoa/mbarman.h | 2 +-
src/cocoa/frame.mm | 6 +++---
src/cocoa/mbarman.mm | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h
index a7947bde1b..32c013e0da 100644
--- a/include/wx/cocoa/mbarman.h
+++ b/include/wx/cocoa/mbarman.h
@@ -50,7 +50,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);
diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index b37aaa181f..9e529f1187 100644
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -59,13 +59,13 @@ wxFrame::~wxFrame()
void wxFrame::AttachMenuBar(wxMenuBar *mbar)
{
wxFrameBase::AttachMenuBar(mbar);
- wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+ wxMenuBarManager::GetInstance()->UpdateMenuBar();
}
void wxFrame::DetachMenuBar()
{
wxFrameBase::DetachMenuBar();
- wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+ wxMenuBarManager::GetInstance()->UpdateMenuBar();
}
void wxFrame::SetMenuBar(wxMenuBar *menubar)
@@ -78,7 +78,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menubar)
wxFrameBase::DetachMenuBar();
wxFrameBase::AttachMenuBar(menubar);
- wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+ wxMenuBarManager::GetInstance()->UpdateMenuBar();
}
wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)
diff --git a/src/cocoa/mbarman.mm b/src/cocoa/mbarman.mm
index e672517182..c6cf916e64 100644
--- a/src/cocoa/mbarman.mm
+++ b/src/cocoa/mbarman.mm
@@ -277,7 +277,7 @@ void wxMenuBarManager::InstallMenuBarForWindow(wxCocoaNSWindow *win)
SetMenuBar(menubar);
}
-void wxMenuBarManager::UpdateWindowMenuBar(wxTopLevelWindowNative *win)
+void wxMenuBarManager::UpdateMenuBar()
{
if(m_windowCurrent)
InstallMenuBarForWindow(m_windowCurrent);
--
2.47.2