X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a83b9bd10b7d92520c202e6ed6cff2015f13315..3cfde7c049bddf6fd3b4c2e35a6b8ecdcdc1d74f:/src/common/statbar.cpp?ds=sidebyside diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp index 76278969ea..d9a9d24544 100644 --- a/src/common/statbar.cpp +++ b/src/common/statbar.cpp @@ -1,8 +1,8 @@ /////////////////////////////////////////////////////////////////////////////// -// 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 @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "statbar.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,14 +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"; -#include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListString); // ============================================================================ // wxStatusBarBase implementation @@ -43,52 +41,26 @@ WX_DEFINE_LIST(wxListString); 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(); - InitStacks(); - InitStyles(); + m_bSameWidthForAllPanes = true; } wxStatusBarBase::~wxStatusBarBase() { - FreeWidths(); - FreeStacks(); - InitStyles(); -} - -// ---------------------------------------------------------------------------- -// widths array handling -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::InitWidths() -{ - m_statusWidths = NULL; -} - -void wxStatusBarBase::FreeWidths() -{ - delete [] m_statusWidths; -} - -// ---------------------------------------------------------------------------- -// styles array handling -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::InitStyles() -{ - m_statusStyles = NULL; -} - -void wxStatusBarBase::FreeStyles() -{ - delete [] m_statusStyles; + // 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); } // ---------------------------------------------------------------------------- @@ -99,88 +71,42 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths) { wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") ); - bool refresh = FALSE; - - if ( number != m_nFields ) + if ( (size_t)number > m_panes.GetCount() ) { - // copy stacks if present - if(m_statusTextStacks) - { - wxListString **newStacks = new wxListString*[number]; - size_t i, j, max = wxMin(number, m_nFields); - - // copy old stacks - for(i = 0; i < max; ++i) - newStacks[i] = m_statusTextStacks[i]; - // free old stacks in excess - for(j = i; j < (size_t)m_nFields; ++j) - { - if(m_statusTextStacks[j]) - { - m_statusTextStacks[j]->Clear(); - delete m_statusTextStacks[j]; - } - } - // initialize new stacks to NULL - for(j = i; j < (size_t)number; ++j) - newStacks[j] = 0; - - m_statusTextStacks = newStacks; - } - - // Resize styles array - if (m_statusStyles) - { - int *oldStyles = m_statusStyles; - m_statusStyles = new int[number]; - int i, max = wxMin(number, m_nFields); - - // copy old styles - for (i = 0; i < max; ++i) - m_statusStyles[i] = oldStyles[i]; + wxStatusBarPane newPane; - // initialize new styles to wxSB_NORMAL - for (i = max; i < number; ++i) - m_statusStyles[i] = wxSB_NORMAL; - - // free old styles - delete [] oldStyles; - } - - - m_nFields = number; - - ReinitWidths(); - - refresh = TRUE; + // 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: keep the old m_statusWidths if we had them - - if ( widths ) + else if ( (size_t)number < m_panes.GetCount() ) { - SetStatusWidths(number, widths); - - // already done from SetStatusWidths() - refresh = FALSE; + // remove entries in excess + m_panes.RemoveAt(number, m_panes.GetCount()-number); } - if ( refresh ) - Refresh(); + // SetStatusWidths will automatically refresh + SetStatusWidths(number, widths); } void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), - const int widths[]) + const int widths[]) { - wxCHECK_RET( widths, _T("NULL pointer in SetStatusWidths") ); - - 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++ ) + if (widths == NULL) + { + // special value meaning: override explicit pane widths and make them all + // of the same size + m_bSameWidthForAllPanes = true; + } + else { - m_statusWidths[i] = widths[i]; + for ( size_t i = 0; i < m_panes.GetCount(); i++ ) + m_panes[i].nWidth = widths[i]; + + m_bSameWidthForAllPanes = false; } // update the display after the widths changed @@ -188,19 +114,14 @@ void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n), } void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n), - const int styles[]) + const int styles[]) { wxCHECK_RET( styles, _T("NULL pointer in SetStatusStyles") ); - wxASSERT_MSG( n == m_nFields, _T("field number mismatch") ); - - if ( !m_statusStyles ) - m_statusStyles = new int[m_nFields]; + wxASSERT_MSG( (size_t)n == m_panes.GetCount(), _T("field number mismatch") ); - for ( int i = 0; i < m_nFields; i++ ) - { - m_statusStyles[i] = styles[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(); @@ -210,52 +131,51 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const { wxArrayInt widths; - if ( m_statusWidths == NULL ) + if ( m_bSameWidthForAllPanes ) { - if ( m_nFields ) + // 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-- ) { - // default: all fields have the same width - int nWidth = widthTotal / m_nFields; - for ( int i = 0; i < m_nFields; 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: we're empty anyhow } - 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 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 { - int nVarWidth = widthExtra > 0 ? (widthExtra * -m_statusWidths[i]) / nVarCount : 0; - nVarCount += m_statusWidths[i]; + int nVarWidth = widthExtra > 0 ? (widthExtra * (-m_panes[i].nWidth)) / nVarCount : 0; + nVarCount += m_panes[i].nWidth; widthExtra -= nVarWidth; widths.Add(nVarWidth); } @@ -266,87 +186,25 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const } // ---------------------------------------------------------------------------- -// text stacks handling -// ---------------------------------------------------------------------------- - -void wxStatusBarBase::InitStacks() -{ - m_statusTextStacks = NULL; -} - -void wxStatusBarBase::FreeStacks() -{ - if(!m_statusTextStacks) return; - size_t i; - - for(i = 0; i < (size_t)m_nFields; ++i) - { - if(m_statusTextStacks[i]) - { - wxListString& t = *m_statusTextStacks[i]; - WX_CLEAR_LIST(wxListString, t); - delete m_statusTextStacks[i]; - } - } - - delete[] m_statusTextStacks; -} - -// ---------------------------------------------------------------------------- -// text stacks +// status text stacks // ---------------------------------------------------------------------------- void wxStatusBarBase::PushStatusText(const wxString& text, int number) { - wxListString* st = GetOrCreateStatusStack(number); - // This long-winded way around avoids an internal compiler error - // in VC++ 6 with RTTI enabled - wxString tmp1(GetStatusText(number)); - wxString* tmp = new wxString(tmp1); - st->Insert(tmp); + // 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) { - wxListString *st = GetStatusStack(number); - wxCHECK_RET( st, _T("Unbalanced PushStatusText/PopStatusText") ); - wxListString::compatibility_iterator top = st->GetFirst(); - - SetStatusText(*top->GetData(), number); - delete top->GetData(); - st->Erase(top); - if(st->GetCount() == 0) - { - delete st; - m_statusTextStacks[number] = 0; - } -} + wxString text = m_panes[number].arrStack.back(); + m_panes[number].arrStack.pop_back(); // also remove it from the stack -wxListString *wxStatusBarBase::GetStatusStack(int i) const -{ - if(!m_statusTextStacks) - return 0; - return m_statusTextStacks[i]; -} - -wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i) -{ - if(!m_statusTextStacks) - { - m_statusTextStacks = new wxListString*[m_nFields]; - - size_t j; - for(j = 0; j < (size_t)m_nFields; ++j) m_statusTextStacks[j] = 0; - } - - if(!m_statusTextStacks[i]) - { - m_statusTextStacks[i] = new wxListString(); - } - - return m_statusTextStacks[i]; + // restore the popped status text in the pane + SetStatusText(text, number); } #endif // wxUSE_STATUSBAR -