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

fixed compilation for wxUSE_STATUSBAR w/o wxUSE_MENUS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-08-01 12:01:24 +00:00
parent 3c67ec06a7
commit f257ac8784
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/frame.h
View File

@@ -168,9 +168,11 @@ public:
{ return false; } { return false; }
#endif // no wxTopLevelWindowNative #endif // no wxTopLevelWindowNative
#if wxUSE_MENUS || wxUSE_TOOLBAR
// show help text (typically in the statusbar); show is false // show help text (typically in the statusbar); show is false
// if you are hiding the help, true otherwise // if you are hiding the help, true otherwise
virtual void DoGiveHelp(const wxString& text, bool show); virtual void DoGiveHelp(const wxString& text, bool show);
#endif
protected: protected:
// the frame main menu/status/tool bars // the frame main menu/status/tool bars
@@ -196,12 +198,12 @@ protected:
virtual void AttachMenuBar(wxMenuBar *menubar); virtual void AttachMenuBar(wxMenuBar *menubar);
wxMenuBar *m_frameMenuBar; wxMenuBar *m_frameMenuBar;
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR)
// the saved status bar text overwritten by DoGiveHelp() // the saved status bar text overwritten by DoGiveHelp()
wxString m_oldStatusText; wxString m_oldStatusText;
#endif // wxUSE_STATUSBAR #endif
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// override to update status bar position (or anything else) when // override to update status bar position (or anything else) when

2
src/common/framecmn.cpp
View File

@@ -403,6 +403,7 @@ void wxFrameBase::SetStatusBar(wxStatusBar *statBar)
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
#if wxUSE_MENUS || wxUSE_TOOLBAR
void wxFrameBase::DoGiveHelp(const wxString& text, bool show) void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
{ {
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
@@ -446,6 +447,7 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
wxUnusedVar(show); wxUnusedVar(show);
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }
#endif // wxUSE_MENUS || wxUSE_TOOLBAR
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------