X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18afa2acbefa9b89587a213513f2118958d0c20a..79c78d4284afd3ca726edf16763d248dc6253386:/src/common/framecmn.cpp diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 2ab0ab0fa3..bdd5dc26d1 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "framebase.h" #endif @@ -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 // ============================================================================ @@ -124,20 +128,20 @@ bool wxFrameBase::IsOneOfBars(const wxWindow *win) const { #if wxUSE_MENUS if ( win == GetMenuBar() ) - return TRUE; + return true; #endif // wxUSE_MENUS #if wxUSE_STATUSBAR if ( win == GetStatusBar() ) - return TRUE; + return true; #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR if ( win == GetToolBar() ) - return TRUE; + return true; #endif // wxUSE_TOOLBAR - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -181,7 +185,7 @@ bool wxFrameBase::ProcessCommand(int id) #if wxUSE_MENUS wxMenuBar *bar = GetMenuBar(); if ( !bar ) - return FALSE; + return false; wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id); commandEvent.SetEventObject(this); @@ -190,7 +194,7 @@ bool wxFrameBase::ProcessCommand(int id) if (item) { if (!item->IsEnabled()) - return TRUE; + return true; if (item->IsCheckable()) { @@ -202,9 +206,9 @@ bool wxFrameBase::ProcessCommand(int id) } GetEventHandler()->ProcessEvent(commandEvent); - return TRUE; + return true; #else // !wxUSE_MENUS - return FALSE; + return false; #endif // wxUSE_MENUS/!wxUSE_MENUS } @@ -214,7 +218,7 @@ bool wxFrameBase::ProcessCommand(int id) void wxFrameBase::UpdateWindowUI(long flags) { wxWindowBase::UpdateWindowUI(flags); - + #if wxUSE_TOOLBAR if (GetToolBar()) GetToolBar()->UpdateWindowUI(flags); @@ -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,22 +253,46 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event) #endif // wxUSE_STATUSBAR } +#if !wxUSE_IDLEMENUUPDATES +void wxFrameBase::OnMenuOpen(wxMenuEvent& event) +#else +void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event)) +#endif +{ +#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() { + wxTopLevelWindow::OnInternalIdle(); + #if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES if (wxUpdateUIEvent::CanUpdate(this)) DoMenuUpdates(); #endif } -void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event)) -{ -#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES - DoMenuUpdates(); -#endif -} - // ---------------------------------------------------------------------------- // status bar stuff // ---------------------------------------------------------------------------- @@ -279,9 +309,7 @@ wxStatusBar* wxFrameBase::CreateStatusBar(int number, wxCHECK_MSG( !m_frameStatusBar, (wxStatusBar *)NULL, wxT("recreating status bar in wxFrame") ); - m_frameStatusBar = OnCreateStatusBar( number, style, id, name ); - if ( m_frameStatusBar ) - PositionStatusBar(); + SetStatusBar(OnCreateStatusBar(number, style, id, name)); return m_frameStatusBar; } @@ -352,21 +380,66 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId) return !helpString.IsEmpty(); #else // !wxUSE_MENUS - return FALSE; + return false; #endif // wxUSE_MENUS/!wxUSE_MENUS } +void wxFrameBase::SetStatusBar(wxStatusBar *statBar) +{ + bool hadBar = m_frameStatusBar != NULL; + m_frameStatusBar = statBar; + + if ( (m_frameStatusBar != NULL) != hadBar ) + { + PositionStatusBar(); + + DoLayout(); + } +} + #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; + 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); +#else + wxUnusedVar(text); + wxUnusedVar(show); #endif // wxUSE_STATUSBAR } @@ -386,7 +459,19 @@ wxToolBar* wxFrameBase::CreateToolBar(long style, wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL, wxT("recreating toolbar in wxFrame") ); - m_frameToolBar = OnCreateToolBar(style, id, name); + if ( style == -1 ) + { + // use default style + // + // NB: we don't specify the default value in the method declaration + // because + // a) this allows us to have different defaults for different + // platforms (even if we don't have them right now) + // b) we don't need to include wx/toolbar.h in the header then + style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT; + } + + SetToolBar(OnCreateToolBar(style, id, name)); return m_frameToolBar; } @@ -400,6 +485,19 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style, style, name); } +void wxFrameBase::SetToolBar(wxToolBar *toolbar) +{ + bool hadBar = m_frameToolBar != NULL; + m_frameToolBar = toolbar; + + if ( (m_frameToolBar != NULL) != hadBar ) + { + PositionToolBar(); + + DoLayout(); + } +} + #endif // wxUSE_TOOLBAR // ---------------------------------------------------------------------------- @@ -409,13 +507,15 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style, #if wxUSE_MENUS // update all menus -void wxFrameBase::DoMenuUpdates() +void wxFrameBase::DoMenuUpdates(wxMenu* menu) { + wxEvtHandler* source = GetEventHandler(); wxMenuBar* bar = GetMenuBar(); - if ( bar != NULL ) + if (menu) + menu->UpdateUI(source); + else if ( bar != NULL ) { - wxEvtHandler* source = GetEventHandler(); int nCount = bar->GetMenuCount(); for (int n = 0; n < nCount; n++) bar->GetMenu(n)->UpdateUI(source); @@ -450,7 +550,7 @@ void wxFrameBase::SetMenuBar(wxMenuBar *menubar) DetachMenuBar(); - AttachMenuBar(menubar); + this->AttachMenuBar(menubar); } #endif // wxUSE_MENUS