Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of the wxListString class in wxStatusBar code; introduce a wxStatusBarPane class which enormously simplifies the code handling stacks/widths/styles of panes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-31 12:28:05 +00:00
parent 6f97a0d599
commit 7b6fefbed1
9 changed files with 172 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
src/common/statbar.cpp
View File

@@ -2,7 +2,7 @@
// 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 <zeitlin@dptmaths.ens-cachan.fr>
@@ -32,71 +32,35 @@
#include "wx/frame.h"
#endif //WX_PRECOMP
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxListString)
const char wxStatusBarNameStr[] = "statusBar";
// ============================================================================
// wxStatusBarBase implementation
// ============================================================================
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();
FreeStyles();
// notify the frame that it doesn't have a status bar any longer to avoid
// dangling pointers
wxFrame *frame = wxDynamicCast(GetParent(), wxFrame);
wxFrame *frame = dynamic_cast<wxFrame*>(GetParent());
if ( frame && frame->GetStatusBar() == this )
{
frame->SetStatusBar(NULL);
}
}
// ----------------------------------------------------------------------------
// 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;
}
// ----------------------------------------------------------------------------
@@ -109,60 +73,22 @@ void wxStatusBarBase::SetFieldsCount(int number, const int *widths)
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);
wxStatusBarPane newPane;
// 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];
// 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
else if ( (size_t)number < m_panes.GetCount() )
{
// remove entries in excess
m_panes.RemoveAt(number, m_panes.GetCount()-number);
}
refresh = true;
if ( widths )
{
@@ -181,15 +107,12 @@ void wxStatusBarBase::SetStatusWidths(int WXUNUSED_UNLESS_DEBUG(n),
{
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 ( size_t i = 0; i < m_panes.GetCount(); i++ )
m_panes[i].nWidth = widths[i];
for ( int i = 0; i < m_nFields; i++ )
{
m_statusWidths[i] = widths[i];
}
m_bSameWidthForAllPanes = false;
// update the display after the widths changed
Refresh();
@@ -200,15 +123,10 @@ void wxStatusBarBase::SetStatusStyles(int WXUNUSED_UNLESS_DEBUG(n),
{
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_statusStyles )
m_statusStyles = new int[m_nFields];
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();
@@ -218,61 +136,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. 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-- )
{
// divide the unassigned width evently between the
// not yet processed fields:
int w = widthToUse / i;
widths.Add(w);
widthToUse -= w;
}
// 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,
nVarCount = 0,
i;
for ( i = 0; i < m_nFields; i++ )
size_t nTotalWidth = 0,
nVarCount = 0,
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);
}
@@ -283,86 +191,25 @@ wxArrayInt wxStatusBarBase::CalculateAbsWidths(wxCoord widthTotal) const
}
// ----------------------------------------------------------------------------
// text stacks handling
// ----------------------------------------------------------------------------
void wxStatusBarBase::InitStacks()
{
m_statusTextStacks = NULL;
}
void wxStatusBarBase::FreeStacks()
{
if ( !m_statusTextStacks )
return;
for ( size_t 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();
wxString text = m_panes[number].arrStack.back();
m_panes[number].arrStack.pop_back(); // also remove it from the stack
SetStatusText(*top->GetData(), number);
delete top->GetData();
st->Erase(top);
if(st->GetCount() == 0)
{
delete st;
m_statusTextStacks[number] = 0;
}
}
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