X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a93e536be025cae6ebdae27c940a72ff59c0a006..6cab4fcac7fe26d9ae5a1d29066e0893d689bb38:/src/common/statbar.cpp diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp index bd3a277d88..9ceccf1277 100644 --- a/src/common/statbar.cpp +++ b/src/common/statbar.cpp @@ -1,12 +1,12 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/statbar.cpp +// Name: src/common/statbar.cpp // Purpose: wxStatusBarBase implementation // Author: Vadim Zeitlin -// Modified by: +// Modified by: Francesco Montorsi // Created: 14.10.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "statbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,11 +24,16 @@ #pragma hdrstop #endif +#if wxUSE_STATUSBAR + +#include "wx/statusbr.h" + #ifndef WX_PRECOMP - #include "wx/statusbr.h" + #include "wx/frame.h" #endif //WX_PRECOMP -#if wxUSE_STATUSBAR +const char wxStatusBarNameStr[] = "statusBar"; + // ============================================================================ // wxStatusBarBase implementation @@ -40,34 +41,26 @@ IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow) +#include "wx/arrimpl.cpp" // This is a magic incantation which must be done! +WX_DEFINE_OBJARRAY(wxStatusBarPaneArray) + + // ---------------------------------------------------------------------------- // ctor/dtor // ---------------------------------------------------------------------------- wxStatusBarBase::wxStatusBarBase() { - m_nFields = 0; - - InitWidths(); + m_bSameWidthForAllPanes = true; } wxStatusBarBase::~wxStatusBarBase() { - FreeWidths(); -} - -// ---------------------------------------------------------------------------- -// widths array handling -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::InitWidths() -{ - m_statusWidths = NULL; -} - -void wxStatusBarBase::FreeWidths() -{ - delete [] m_statusWidths; + // notify the frame that it doesn't have a status bar any longer to avoid + // dangling pointers + wxFrame *frame = wxDynamicCast(GetParent(), wxFrame); + if ( frame && frame->GetStatusBar() == this ) + frame->SetStatusBar(NULL); } // ---------------------------------------------------------------------------- @@ -78,44 +71,57 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths) { wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") ); - bool refresh = FALSE; + if ( (size_t)number > m_panes.GetCount() ) + { + wxStatusBarPane newPane; - if ( number != m_nFields ) + // add more entries with the default style and zero width + // (this will be set later) + for (size_t i = m_panes.GetCount(); i < (size_t)number; ++i) + m_panes.Add(newPane); + } + else if ( (size_t)number < m_panes.GetCount() ) { - m_nFields = number; + // remove entries in excess + m_panes.RemoveAt(number, m_panes.GetCount()-number); + } - ReinitWidths(); + // SetStatusWidths will automatically refresh + SetStatusWidths(number, widths); +} - refresh = TRUE; - } - //else: keep the old m_statusWidths if we had them +void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), + const int widths[]) +{ + wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") ); - if ( widths ) + if (widths == NULL) { - SetStatusWidths(number, widths); + // special value meaning: override explicit pane widths and make them all + // of the same size + m_bSameWidthForAllPanes = true; + } + else + { + for ( size_t i = 0; i < m_panes.GetCount(); i++ ) + m_panes[i].nWidth = widths[i]; - // already done from SetStatusWidths() - refresh = FALSE; + m_bSameWidthForAllPanes = false; } - if ( refresh ) - Refresh(); + // update the display after the widths changed + Refresh(); } -void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), - const int widths[]) +void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n), + const int styles[]) { - wxCHECK_RET( widths, _T("NULL pointer in SetStatusWidths") ); + wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") ); - wxASSERT_MSG( n == m_nFields, _T("field number mismatch") ); + wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") ); - if ( !m_statusWidths ) - m_statusWidths = new int[m_nFields]; - - for ( int i = 0; i < m_nFields; i++ ) - { - m_statusWidths[i] = widths[i]; - } + for ( size_t i = 0; i < m_panes.GetCount(); i++ ) + m_panes[i].nStyle = styles[i]; // update the display after the widths changed Refresh(); @@ -125,56 +131,53 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const { wxArrayInt widths; - if ( m_statusWidths == NULL ) + if ( m_bSameWidthForAllPanes ) { - // default: all fields have the same width - int nWidth = widthTotal / m_nFields; - for ( int i = 0; i < m_nFields; i++ ) + // Default: all fields have the same width. This is not always + // possible to do exactly (if widthTotal is not divisible by + // m_panes.GetCount()) - if that happens, we distribute the extra + // pixels among all fields: + int widthToUse = widthTotal; + + for ( size_t i = m_panes.GetCount(); i > 0; i-- ) { - widths.Add(nWidth); + // divide the unassigned width evently between the + // not yet processed fields: + int w = widthToUse / i; + widths.Add(w); + widthToUse -= w; } } - else // have explicit status widths + else // do not override explicit pane widths { // calculate the total width of all the fixed width fields and the // total number of var field widths counting with multiplicity - int nTotalWidth = 0, + size_t nTotalWidth = 0, nVarCount = 0, i; - for ( i = 0; i < m_nFields; i++ ) + + for ( i = 0; i < m_panes.GetCount(); i++ ) { - if ( m_statusWidths[i] >= 0 ) - { - nTotalWidth += m_statusWidths[i]; - } + if ( m_panes[i].nWidth >= 0 ) + nTotalWidth += m_panes[i].nWidth; else - { - nVarCount += -m_statusWidths[i]; - } + nVarCount += -m_panes[i].nWidth; } // the amount of extra width we have per each var width field - int nVarWidth; - if ( nVarCount ) - { - int widthExtra = widthTotal - nTotalWidth; - nVarWidth = widthExtra > 0 ? widthExtra / nVarCount : 0; - } - else // no var width fields at all - { - nVarWidth = 0; - } + int widthExtra = widthTotal - nTotalWidth; // do fill the array - for ( i = 0; i < m_nFields; i++ ) + for ( i = 0; i < m_panes.GetCount(); i++ ) { - if ( m_statusWidths[i] >= 0 ) - { - widths.Add(m_statusWidths[i]); - } + if ( m_panes[i].nWidth >= 0 ) + widths.Add(m_panes[i].nWidth); else { - widths.Add(-m_statusWidths[i]*nVarWidth); + int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].nWidth)) / nVarCount : 0; + nVarCount += m_panes[i].nWidth; + widthExtra -= nVarWidth; + widths.Add(nVarWidth); } } } @@ -182,5 +185,26 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const return widths; } -#endif // wxUSE_STATUSBAR +// ---------------------------------------------------------------------------- +// status text stacks +// ---------------------------------------------------------------------------- + +void wxStatusBarBase::PushStatusText(const wxString& text, int number) +{ + // save current status text in the stack + m_panes[number].arrStack.push_back(GetStatusText(number)); + // update current status text + SetStatusText(text, number); +} + +void wxStatusBarBase::PopStatusText(int number) +{ + wxString text = m_panes[number].arrStack.back(); + m_panes[number].arrStack.pop_back(); // also remove it from the stack + + // restore the popped status text in the pane + SetStatusText(text, number); +} + +#endif // wxUSE_STATUSBAR