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

diff --git a/include/wx/cocoa/mbarman.h b/include/wx/cocoa/mbarman.h
index a7947bde1b50763d7109484f31a52404b892d07a..32c013e0da51911b569ac26f138cff1e17214d59 100644 (file)
--- 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 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);

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index b37aaa181f3246362ec3e85c45112c18f7b970cc..9e529f118713fe831ff6a366687339581c145d3f 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -59,13 +59,13 @@ wxFrame::~wxFrame()
 void wxFrame::AttachMenuBar(wxMenuBar *mbar)
 {
     wxFrameBase::AttachMenuBar(mbar);
 void wxFrame::AttachMenuBar(wxMenuBar *mbar)
 {
     wxFrameBase::AttachMenuBar(mbar);

-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();

 }
 
 void wxFrame::DetachMenuBar()
 {
     wxFrameBase::DetachMenuBar();
 }
 
 void wxFrame::DetachMenuBar()
 {
     wxFrameBase::DetachMenuBar();

-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();

 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menubar)
 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menubar)


@@ -78,7 +78,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menubar)
 
     wxFrameBase::DetachMenuBar();
     wxFrameBase::AttachMenuBar(menubar);
 
     wxFrameBase::DetachMenuBar();
     wxFrameBase::AttachMenuBar(menubar);

-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();

 }
 
 wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)
 }
 
 wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)

diff --git a/src/cocoa/mbarman.mm b/src/cocoa/mbarman.mm
index e67251718289960fab3dd7d61f39e74d5bd7759b..c6cf916e646cdf001e7fb582310cb9068c179cc5 100644 (file)
--- a/src/cocoa/mbarman.mm
+++ b/src/cocoa/mbarman.mm
@@ -277,7 +277,7 @@ void wxMenuBarManager::InstallMenuBarForWindow(wxCocoaNSWindow *win)
     SetMenuBar(menubar);
 }
 
     SetMenuBar(menubar);
 }
 

-void wxMenuBarManager::UpdateWindowMenuBar(wxTopLevelWindowNative *win)
+void wxMenuBarManager::UpdateMenuBar()

 {
     if(m_windowCurrent)
         InstallMenuBarForWindow(m_windowCurrent);
 {
     if(m_windowCurrent)
         InstallMenuBarForWindow(m_windowCurrent);