From: Vadim Zeitlin Date: Sat, 7 Jun 2003 12:40:34 +0000 (+0000) Subject: DoGiveHelp() should be defined even if !wxUSE_STATUSBAR X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c60a36d5ddcc094e42b1d1ec8ab74c1c71e0f458 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 --- diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index cf0fbc201d..a057189897 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -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 // ----------------------------------------------------------------------------