X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6522713c7527e5f683a107dff8f40e3ea19a4745..0425151023593cb31da0ee0a652da173ca9abfde:/src/common/framecmn.cpp diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 318b662f28..cbf6bf21ee 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Vadim Zeitlin // Created: 01/02/97 // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -45,11 +45,11 @@ // event table // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxFrameBase, wxWindow) - EVT_IDLE(wxFrameBase::OnIdle) - EVT_CLOSE(wxFrameBase::OnCloseWindow) +BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow) +#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES + EVT_MENU_OPEN(wxFrameBase::OnMenuOpen) +#endif EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight) - EVT_SIZE(wxFrameBase::OnSize) END_EVENT_TABLE() // ============================================================================ @@ -73,16 +73,13 @@ wxFrameBase::wxFrameBase() #if wxUSE_STATUSBAR m_frameStatusBar = NULL; #endif // wxUSE_STATUSBAR + + m_statusBarPane = 0; } -bool wxFrameBase::Destroy() +wxFrameBase::~wxFrameBase() { - // delayed destruction: the frame will be deleted during the next idle - // loop iteration - if ( !wxPendingDelete.Member(this) ) - wxPendingDelete.Append(this); - - return TRUE; + // this destructor is required for Darwin } wxFrame *wxFrameBase::New(wxWindow *parent, @@ -152,15 +149,16 @@ bool wxFrameBase::IsOneOfBars(const wxWindow *win) const // get the origin of the client area in the client coordinates wxPoint wxFrameBase::GetClientAreaOrigin() const { - wxPoint pt(0, 0); + wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin(); -#if wxUSE_TOOLBAR - if ( GetToolBar() && GetToolBar()->IsShown() ) +#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__) + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) { int w, h; - GetToolBar()->GetSize(& w, & h); + toolbar->GetSize(&w, &h); - if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) { pt.x += w; } @@ -174,48 +172,10 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const return pt; } -void wxFrameBase::DoScreenToClient(int *x, int *y) const -{ - wxWindow::DoScreenToClient(x, y); - - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt(GetClientAreaOrigin()); - *x -= pt.x; - *y -= pt.y; -} - -void wxFrameBase::DoClientToScreen(int *x, int *y) const -{ - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt1(GetClientAreaOrigin()); - *x += pt1.x; - *y += pt1.y; - - wxWindow::DoClientToScreen(x, y); -} - // ---------------------------------------------------------------------------- // misc // ---------------------------------------------------------------------------- -// make the window modal (all other windows unresponsive) -void wxFrameBase::MakeModal(bool modal) -{ - if ( modal ) - { - wxEnableTopLevelWindows(FALSE); - Enable(TRUE); // keep this window enabled - } - else - { - wxEnableTopLevelWindows(TRUE); - } -} - bool wxFrameBase::ProcessCommand(int id) { #if wxUSE_MENUS @@ -227,84 +187,58 @@ bool wxFrameBase::ProcessCommand(int id) commandEvent.SetEventObject(this); wxMenuItem *item = bar->FindItem(id); - if ( item && item->IsCheckable() ) + if (item) { - item->Toggle(); + if (!item->IsEnabled()) + return TRUE; + + if (item->IsCheckable()) + { + item->Toggle(); - // use the new value - commandEvent.SetInt(item->IsChecked()); + // use the new value + commandEvent.SetInt(item->IsChecked()); + } } - return GetEventHandler()->ProcessEvent(commandEvent); + GetEventHandler()->ProcessEvent(commandEvent); + return TRUE; #else // !wxUSE_MENUS return FALSE; #endif // wxUSE_MENUS/!wxUSE_MENUS } -// ---------------------------------------------------------------------------- -// event handlers -// ---------------------------------------------------------------------------- - -// default resizing behaviour - if only ONE subwindow, resize to fill the -// whole client area -void wxFrameBase::OnSize(wxSizeEvent& WXUNUSED(event)) +// Do the UI update processing for this window. This is +// provided for the application to call if it wants to +// force a UI update, particularly for the menus and toolbar. +void wxFrameBase::UpdateWindowUI(long flags) { - // if we're using constraints - do use them -#if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) - { - Layout(); - } - else -#endif // wxUSE_CONSTRAINTS - { - // do we have _exactly_ one child? - wxWindow *child = (wxWindow *)NULL; - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *win = node->GetData(); - - // exclude top level and managed windows (status bar isn't - // currently in the children list except under wxMac anyhow, but - // it makes no harm to test for it) - if ( !win->IsTopLevel() && !IsOneOfBars(win) ) - { - if ( child ) - { - return; // it's our second subwindow - nothing to do - } - - child = win; - } - } - - // do we have any children at all? - if ( child ) - { - // exactly one child - set it's size to fill the whole frame - int clientW, clientH; - DoGetClientSize(&clientW, &clientH); - - // for whatever reasons, wxGTK wants to have a small offset - it - // probably looks better with it? -#ifdef __WXGTK__ - static const int ofs = 1; -#else - static const int ofs = 0; + wxWindowBase::UpdateWindowUI(flags); + +#if wxUSE_TOOLBAR + if (GetToolBar()) + GetToolBar()->UpdateWindowUI(flags); #endif - child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs); +#if wxUSE_MENUS + if (GetMenuBar()) + { + if ((flags & wxUPDATE_UI_FROMIDLE) && !wxUSE_IDLEMENUUPDATES) + { + // If coming from an idle event, we only + // want to update the menus if we're + // in the wxUSE_IDLEMENUUPDATES configuration: + // so if we're not, do nothing } + else + DoMenuUpdates(); } +#endif } -// The default implementation for the close window event. -void wxFrameBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) -{ - Destroy(); -} +// ---------------------------------------------------------------------------- +// event handlers +// ---------------------------------------------------------------------------- void wxFrameBase::OnMenuHighlight(wxMenuEvent& event) { @@ -313,19 +247,22 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event) #endif // wxUSE_STATUSBAR } -bool wxFrameBase::SendIconizeEvent(bool iconized) +// Implement internal behaviour (menu updating on some platforms) +void wxFrameBase::OnInternalIdle() { - wxIconizeEvent event(GetId(), iconized); - event.SetEventObject(this); - - return GetEventHandler()->ProcessEvent(event); + wxTopLevelWindow::OnInternalIdle(); + +#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES + if (wxUpdateUIEvent::CanUpdate(this)) + DoMenuUpdates(); +#endif } -void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) ) +void wxFrameBase::OnMenuOpen(wxMenuEvent& event) { -#if wxUSE_MENUS - DoMenuUpdates(); -#endif // wxUSE_MENUS +#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES + DoMenuUpdates(event.GetMenu()); +#endif } // ---------------------------------------------------------------------------- @@ -358,17 +295,6 @@ wxStatusBar *wxFrameBase::OnCreateStatusBar(int number, { wxStatusBar *statusBar = new wxStatusBar(this, id, style, name); - // Set the height according to the font and the border size - wxClientDC dc(statusBar); - dc.SetFont(statusBar->GetFont()); - - wxCoord y; - dc.GetTextExtent( "X", NULL, &y ); - - int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY()); - - statusBar->SetSize( -1, -1, -1, height ); - statusBar->SetFieldsCount(number); return statusBar; @@ -390,16 +316,28 @@ void wxFrameBase::SetStatusWidths(int n, const int widths_field[] ) PositionStatusBar(); } -bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId) +void wxFrameBase::PushStatusText(const wxString& text, int number) { -#if wxUSE_MENUS - if ( !statbar ) - return FALSE; + wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") ); + + m_frameStatusBar->PushStatusText(text, number); +} + +void wxFrameBase::PopStatusText(int number) +{ + wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") ); + m_frameStatusBar->PopStatusText(number); +} + +bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId) +{ +#if wxUSE_MENUS // if no help string found, we will clear the status bar text wxString helpString; + bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */; - if ( menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */ ) + if ( show ) { wxMenuBar *menuBar = GetMenuBar(); if ( menuBar ) @@ -412,9 +350,7 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId) } } - // set status text even if the string is empty - this will at least - // remove the string from the item which was previously selected - statbar->SetStatusText(helpString); + DoGiveHelp(helpString, show); return !helpString.IsEmpty(); #else // !wxUSE_MENUS @@ -424,6 +360,19 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId) #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; + + wxString help = show ? text : wxString(); + statbar->SetStatusText( help, m_statusBarPane ); +#endif // wxUSE_STATUSBAR +} + + // ---------------------------------------------------------------------------- // toolbar stuff // ---------------------------------------------------------------------------- @@ -439,6 +388,18 @@ wxToolBar* wxFrameBase::CreateToolBar(long style, wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL, wxT("recreating toolbar in wxFrame") ); + 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; + } + m_frameToolBar = OnCreateToolBar(style, id, name); return m_frameToolBar; @@ -462,51 +423,18 @@ 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(); -#ifdef __WXMSW__ - wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this); -#else - wxWindow* focusWin = (wxWindow*) NULL; -#endif - if ( bar != NULL ) + if (menu) + menu->UpdateUI(source); + else if ( bar != NULL ) { int nCount = bar->GetMenuCount(); for (int n = 0; n < nCount; n++) - DoMenuUpdates(bar->GetMenu(n), focusWin); - } -} - -// update a menu and all submenus recursively -void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin) -{ - wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler(); - wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst(); - while (node) - { - wxMenuItem* item = node->GetData(); - if ( !item->IsSeparator() ) - { - wxWindowID id = item->GetId(); - wxUpdateUIEvent event(id); - event.SetEventObject( this ); - - if (evtHandler->ProcessEvent(event)) - { - if (event.GetSetText()) - menu->SetLabel(id, event.GetText()); - if (event.GetSetChecked()) - menu->Check(id, event.GetChecked()); - if (event.GetSetEnabled()) - menu->Enable(id, event.GetEnabled()); - } - - if (item->GetSubMenu()) - DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL); - } - node = node->GetNext(); + bar->GetMenu(n)->UpdateUI(source); } } @@ -523,8 +451,8 @@ void wxFrameBase::AttachMenuBar(wxMenuBar *menubar) { if ( menubar ) { - m_frameMenuBar = menubar; menubar->Attach((wxFrame *)this); + m_frameMenuBar = menubar; } }