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

restore status bar text after a menu has been shown

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-07 22:55:06 +00:00
parent e1a098d1ec
commit 96ac065f9e
2 changed files with 88 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/common/framecmn.cpp
View File

@@ -45,13 +45,17 @@
// event table
// ----------------------------------------------------------------------------
#if wxUSE_MENUS && wxUSE_STATUSBAR
BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
#endif
EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
END_EVENT_TABLE()
#endif // wxUSE_MENUS && wxUSE_STATUSBAR
// ============================================================================
// implementation
// ============================================================================
@@ -233,13 +237,15 @@ void wxFrameBase::UpdateWindowUI(long flags)
else
DoMenuUpdates();
}
#endif
#endif // wxUSE_MENUS
}
// ----------------------------------------------------------------------------
// event handlers
// event handlers for status bar updates from menus
// ----------------------------------------------------------------------------
#if wxUSE_MENUS && wxUSE_STATUSBAR
void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
#if wxUSE_STATUSBAR
@@ -247,6 +253,31 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
#endif // wxUSE_STATUSBAR
}
void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
{
#if !wxUSE_IDLEMENUUPDATES
DoMenuUpdates(event.GetMenu());
#endif // !wxUSE_IDLEMENUUPDATES
}
void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
{
// do we have real status text to restore?
if ( m_oldStatusText.length() > 1 || m_oldStatusText[0u] )
{
if ( m_statusBarPane >= 0 )
{
wxStatusBar *statbar = GetStatusBar();
if ( statbar )
statbar->SetStatusText(m_oldStatusText, m_statusBarPane);
}
m_oldStatusText.clear();
}
}
#endif // wxUSE_MENUS && wxUSE_STATUSBAR
// Implement internal behaviour (menu updating on some platforms)
void wxFrameBase::OnInternalIdle()
{
@@ -258,13 +289,6 @@ void wxFrameBase::OnInternalIdle()
#endif
}
void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
{
#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
DoMenuUpdates(event.GetMenu());
#endif
}
// ----------------------------------------------------------------------------
// status bar stuff
// ----------------------------------------------------------------------------
@@ -363,12 +387,41 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
{
#if wxUSE_STATUSBAR
if ( m_statusBarPane < 0 ) return;
wxStatusBar* statbar = GetStatusBar();
if ( !statbar ) return;
if ( m_statusBarPane < 0 )
{
// status bar messages disabled
return;
}
wxString help = show ? text : wxString();
statbar->SetStatusText( help, m_statusBarPane );
wxStatusBar *statbar = GetStatusBar();
if ( !statbar )
return;
wxString help;
if ( show )
help = text;
// remember the old status bar text if this is the first time we're called
// since the menu has been opened as we're going to overwrite it in our
// DoGiveHelp() and we want to restore it when the menu is closed
//
// note that it would be logical to do this in OnMenuOpen() but under MSW
// we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely enough, and
// so this doesn't work and instead we use the ugly trick with using
// special m_oldStatusText value as "menu opened" (but it is arguably
// better than adding yet another member variable to wxFrame on all
// platforms)
if ( m_oldStatusText.empty() )
{
m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
if ( m_oldStatusText.empty() )
{
// use special value to prevent us from doing this the next time
m_oldStatusText += _T('\0');
}
}
statbar->SetStatusText(help, m_statusBarPane);
#endif // wxUSE_STATUSBAR
}