diff --git a/include/wx/frame.h b/include/wx/frame.h index 915fd88724..8c599ae435 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -168,9 +168,11 @@ public: { return false; } #endif // no wxTopLevelWindowNative +#if wxUSE_MENUS || wxUSE_TOOLBAR // show help text (typically in the statusbar); show is false // if you are hiding the help, true otherwise virtual void DoGiveHelp(const wxString& text, bool show); +#endif protected: // the frame main menu/status/tool bars @@ -196,12 +198,12 @@ protected: virtual void AttachMenuBar(wxMenuBar *menubar); wxMenuBar *m_frameMenuBar; +#endif // wxUSE_MENUS -#if wxUSE_STATUSBAR +#if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR) // the saved status bar text overwritten by DoGiveHelp() wxString m_oldStatusText; -#endif // wxUSE_STATUSBAR -#endif // wxUSE_MENUS +#endif #if wxUSE_STATUSBAR // override to update status bar position (or anything else) when diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 6581648df7..6c8b6ed182 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -403,6 +403,7 @@ void wxFrameBase::SetStatusBar(wxStatusBar *statBar) #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS || wxUSE_TOOLBAR void wxFrameBase::DoGiveHelp(const wxString& text, bool show) { #if wxUSE_STATUSBAR @@ -446,6 +447,7 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show) wxUnusedVar(show); #endif // wxUSE_STATUSBAR } +#endif // wxUSE_MENUS || wxUSE_TOOLBAR // ----------------------------------------------------------------------------