DoGiveHelp() should be defined even if !wxUSE_STATUSBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
253fe8ab4b
commit
c60a36d5dd
@ -289,18 +289,6 @@ void wxFrameBase::PopStatusText(int number)
|
||||
m_frameStatusBar->PopStatusText(number);
|
||||
}
|
||||
|
||||
void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
|
||||
{
|
||||
#if wxUSE_STATUSBAR
|
||||
if ( m_statusBarPane < 0 ) return;
|
||||
wxStatusBar* statbar = GetStatusBar();
|
||||
if ( !statbar ) return;
|
||||
|
||||
wxString help = show ? text : wxString();
|
||||
statbar->SetStatusText( help, m_statusBarPane );
|
||||
#endif // wxUSE_STATUSBAR
|
||||
}
|
||||
|
||||
bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
|
||||
{
|
||||
#if wxUSE_MENUS
|
||||
@ -331,6 +319,19 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
|
||||
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
|
||||
{
|
||||
#if wxUSE_STATUSBAR
|
||||
if ( m_statusBarPane < 0 ) return;
|
||||
wxStatusBar* statbar = GetStatusBar();
|
||||
if ( !statbar ) return;
|
||||
|
||||
wxString help = show ? text : wxString();
|
||||
statbar->SetStatusText( help, m_statusBarPane );
|
||||
#endif // wxUSE_STATUSBAR
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// toolbar stuff
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user