X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2919ab326e60322b63ae9b5d50e83bb5156efce..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/statbar.cpp?ds=sidebyside diff --git a/src/common/statbar.cpp b/src/common/statbar.cpp index 1ebaf0e3df..3e91d47ec6 100644 --- a/src/common/statbar.cpp +++ b/src/common/statbar.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: common/statbar.cpp +// Name: src/common/statbar.cpp // Purpose: wxStatusBarBase implementation // Author: Vadim Zeitlin // Modified by: @@ -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,18 @@ #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 - #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxListString); +WX_DEFINE_LIST(wxListString) + +const wxChar wxStatusBarNameStr[] = wxT("statusBar"); // ============================================================================ // wxStatusBarBase implementation @@ -60,7 +60,15 @@ wxStatusBarBase::~wxStatusBarBase() { FreeWidths(); FreeStacks(); - InitStyles(); + FreeStyles(); + + // 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,7 +107,7 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths) { wxCHECK_RET( number > 0, _T("invalid field number in SetFieldsCount") ); - bool refresh = FALSE; + bool refresh = false; if ( number != m_nFields ) { @@ -152,7 +160,7 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths) ReinitWidths(); - refresh = TRUE; + refresh = true; } //else: keep the old m_statusWidths if we had them @@ -161,7 +169,7 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths) SetStatusWidths(number, widths); // already done from SetStatusWidths() - refresh = FALSE; + refresh = false; } if ( refresh ) @@ -214,12 +222,21 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const { if ( m_nFields ) { - // 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_nFields) - if that happens, we distribute the extra pixels + // among all fields: + int widthToUse = widthTotal; + + for ( int i = m_nFields; 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: we're empty anyhow } @@ -243,16 +260,7 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const } // 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++ ) @@ -263,7 +271,10 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const } else { - widths.Add(-m_statusWidths[i]*nVarWidth); + int nVarWidth = widthExtra > 0 ? (widthExtra * -m_statusWidths[i]) / nVarCount : 0; + nVarCount += m_statusWidths[i]; + widthExtra -= nVarWidth; + widths.Add(nVarWidth); } } } @@ -282,12 +293,12 @@ void wxStatusBarBase::InitStacks() void wxStatusBarBase::FreeStacks() { - if(!m_statusTextStacks) return; - size_t i; + if ( !m_statusTextStacks ) + return; - for(i = 0; i < (size_t)m_nFields; ++i) + for ( size_t i = 0; i < (size_t)m_nFields; ++i ) { - if(m_statusTextStacks[i]) + if ( m_statusTextStacks[i] ) { wxListString& t = *m_statusTextStacks[i]; WX_CLEAR_LIST(wxListString, t); @@ -355,4 +366,3 @@ wxListString *wxStatusBarBase::GetOrCreateStatusStack(int i) } #endif // wxUSE_STATUSBAR -