fixed compilation for wxUSE_STATUSBAR w/o wxUSE_MENUS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user