Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed UpdateWindowMenuBar to UpdateMenuBar and removed unused parameter

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-11-13 14:23:07 +00:00
parent d14a1e2856
commit 243f5c2d91
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cocoa/mbarman.h
View File

@@ -50,7 +50,7 @@ public:
void WindowDidResignMain(NSNotification *notification); void WindowDidResignMain(NSNotification *notification);
void WindowWillClose(NSNotification *notification); void WindowWillClose(NSNotification *notification);
#endif // 0 #endif // 0
void UpdateWindowMenuBar(wxTopLevelWindowNative *win); void UpdateMenuBar();
protected: protected:
void SetMenuBar(wxMenuBar* menubar); void SetMenuBar(wxMenuBar* menubar);
void InstallMenuBarForWindow(wxCocoaNSWindow *win); void InstallMenuBarForWindow(wxCocoaNSWindow *win);

6
src/cocoa/frame.mm
View File

@@ -59,13 +59,13 @@ wxFrame::~wxFrame()
void wxFrame::AttachMenuBar(wxMenuBar *mbar) void wxFrame::AttachMenuBar(wxMenuBar *mbar)
{ {
wxFrameBase::AttachMenuBar(mbar); wxFrameBase::AttachMenuBar(mbar);
wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this); wxMenuBarManager::GetInstance()->UpdateMenuBar();
} }
void wxFrame::DetachMenuBar() void wxFrame::DetachMenuBar()
{ {
wxFrameBase::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::DetachMenuBar();
wxFrameBase::AttachMenuBar(menubar); wxFrameBase::AttachMenuBar(menubar);
wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this); wxMenuBarManager::GetInstance()->UpdateMenuBar();
} }
wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win) wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)

2
src/cocoa/mbarman.mm
View File

@@ -277,7 +277,7 @@ void wxMenuBarManager::InstallMenuBarForWindow(wxCocoaNSWindow *win)
SetMenuBar(menubar); SetMenuBar(menubar);
} }
void wxMenuBarManager::UpdateWindowMenuBar(wxTopLevelWindowNative *win) void wxMenuBarManager::UpdateMenuBar()
{ {
if(m_windowCurrent) if(m_windowCurrent)
InstallMenuBarForWindow(m_windowCurrent); InstallMenuBarForWindow(m_windowCurrent);