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

removed unused statusbar parameter from wxFrameBase::ShowMenuHelp()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-05-18 16:44:31 +00:00
parent 0d7c4404ac
commit 722ed5bed5
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/frame.h
View File

@ -211,9 +211,10 @@ protected:
// something changes
virtual void PositionStatusBar() { }
// show the help string for this menu item in the given status bar: the
// status bar pointer can be NULL; return true if help was shown
bool ShowMenuHelp(wxStatusBar *statbar, int helpid);
// show the help string for the given menu item using DoGiveHelp() if the
// given item does have a help string, return false if there is no help for
// such item
bool ShowMenuHelp(int helpid);
wxStatusBar *m_frameStatusBar;
#endif // wxUSE_STATUSBAR

4
src/common/framecmn.cpp
View File

@ -253,7 +253,7 @@ void wxFrameBase::UpdateWindowUI(long flags)
void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
#if wxUSE_STATUSBAR
(void)ShowMenuHelp(GetStatusBar(), event.GetMenuId());
(void)ShowMenuHelp(event.GetMenuId());
#endif // wxUSE_STATUSBAR
}
@ -349,7 +349,7 @@ void wxFrameBase::PopStatusText(int number)
m_frameStatusBar->PopStatusText(number);
}
bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
bool wxFrameBase::ShowMenuHelp(int menuId)
{
#if wxUSE_MENUS
// if no help string found, we will clear the status bar text

2
src/gtk/mdi.cpp
View File

@ -408,7 +408,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
{
#if wxUSE_STATUSBAR
wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) )
if ( !ShowMenuHelp(event.GetMenuId()) )
{
// we don't have any help text for this item, but may be the MDI frame
// does?

2
src/gtk1/mdi.cpp
View File

@ -409,7 +409,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
{
#if wxUSE_STATUSBAR
wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) )
if ( !ShowMenuHelp(event.GetMenuId()) )
{
// we don't have any help text for this item, but may be the MDI frame
// does?