// no, don't do this - the borders are meant to be inside this rect
// wxSize sizeBorders =
- m_renderer->GetStatusBarBorders(borderBetweenFields);
+ if ( borderBetweenFields )
+ *borderBetweenFields = m_renderer->GetStatusBarBorderBetweenFields();
//rect.Deflate(sizeBorders.x, sizeBorders.y);
// recalc the field widths if needed
// the total width for the fields doesn't include the borders between
// them
m_widthsAbs = CalculateAbsWidths(rect.width -
- *borderBetweenFields*(m_nFields - 1));
+ *borderBetweenFields*(m_panes.GetCount() - 1));
}
return rect;
// prepare the DC
wxDC& dc = renderer->GetDC();
- dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+ dc.SetFont(GetFont());
+ dc.SetTextForeground(GetForegroundColour());
// do draw the fields
int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;
- for ( int n = 0; n < m_nFields; n++ )
+ for ( int n = 0; n < (int)m_panes.GetCount(); n++ )
{
rect.width = m_widthsAbs[n];
// the size grip may be drawn only on the last field and only if we
// have the corresponding style and even then only if we really can
// resize this frame
- if ( n == m_nFields - 1 &&
- HasFlag(wxST_SIZEGRIP) &&
+ if ( n == (int)m_panes.GetCount() - 1 &&
+ HasFlag(wxSTB_SIZEGRIP) &&
GetParent()->HasFlag(wxRESIZE_BORDER) &&
parentTLW && !parentTLW->IsMaximized() )
{
- // NB: we use wxCONTROL_ISDEFAULT for this because it doesn't
- // have any meaning for the status bar otherwise anyhow
- // (it's still ugly, of course, but there are too few flags
- // to squander them for things like this)
- flags |= wxCONTROL_ISDEFAULT;
+ flags |= wxCONTROL_SIZEGRIP;
}
- int style;
- if (m_statusStyles)
- style = m_statusStyles[n];
- else
- style = wxSB_NORMAL;
- m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags, style);
+ m_renderer->DrawStatusField(dc, rect, GetStatusText(n), flags, m_panes[n].GetStyle());
}
rect.x += rect.width + borderBetweenFields;
}
}
-void wxStatusBarUniv::RefreshField(int i)
+void wxStatusBarUniv::DoUpdateStatusText(int i)
{
wxRect rect;
if ( GetFieldRect(i, rect) )
}
}
-// ----------------------------------------------------------------------------
-// fields text
-// ----------------------------------------------------------------------------
-
-void wxStatusBarUniv::SetStatusText(const wxString& text, int number)
-{
- wxCHECK_RET( number >= 0 && number < m_nFields,
- _T("invalid status bar field index in SetStatusText()") );
-
- if ( text == m_statusText[number] )
- {
- // nothing changed
- return;
- }
-
- m_statusText[number] = text;
-
- RefreshField(number);
-}
-
-wxString wxStatusBarUniv::GetStatusText(int number) const
-{
- wxCHECK_MSG( number >= 0 && number < m_nFields, wxEmptyString,
- _T("invalid status bar field index") );
-
- return m_statusText[number];
-}
-
// ----------------------------------------------------------------------------
// fields count/widths
// ----------------------------------------------------------------------------
void wxStatusBarUniv::SetFieldsCount(int number, const int *widths)
{
- m_statusText.SetCount(number);
wxStatusBarBase::SetFieldsCount(number, widths);
+
m_widthsAbs.Empty();
}
{
// we don't need to refresh the fields whose width didn't change, so find
// the first field whose width did change and refresh starting from it
- int field;
- if ( m_statusWidths )
+ size_t field;
+ if ( m_bSameWidthForAllPanes )
+ {
+ // hence all fields widths have changed
+ field = 0;
+ }
+ else
{
- for ( field = 0; field < m_nFields; field++ )
+ for ( field = 0; field < m_panes.GetCount(); field++ )
{
- if ( m_statusWidths[field] < 0 )
+ if ( m_panes[field].GetWidth() < 0 )
{
// var width field
break;
}
}
}
- else // all fields have the same width
- {
- // hence all fields widths have changed
- field = 0;
- }
- if ( field < m_nFields )
+ if ( field < m_panes.GetCount() )
{
// call this before invalidating the old widths as we want to use them,
// not the new ones
bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
{
- wxCHECK_MSG( n >= 0 && n < m_nFields, false,
- _T("invalid field index in GetFieldRect()") );
+ wxCHECK_MSG( n >= 0 && (size_t)n < m_panes.GetCount(), false,
+ wxT("invalid field index in GetFieldRect()") );
// this is a fix for a bug exhibited by the statbar sample: if
// GetFieldRect() is called from the derived class OnSize() handler, then
// it's the caller responsability to check this, if unsure - call
// GetFieldRect() instead
wxCHECK_MSG( !m_widthsAbs.IsEmpty(), rect,
- _T("can't be called if we don't have the widths") );
+ wxT("can't be called if we don't have the widths") );
for ( int i = 0; i <= n; i++ )
{
wxCoord wxStatusBarUniv::GetHeight() const
{
- wxClientDC dc(wxConstCast(this, wxStatusBarUniv));
- dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-
- return dc.GetCharHeight() + 2*GetBorderY();
+ return GetCharHeight() + 2*GetBorderY();
}
wxSize wxStatusBarUniv::DoGetBestSize() const
int wxStatusBarUniv::GetBorderX() const
{
- return m_renderer->GetStatusBarBorders(NULL).x;
+ return m_renderer->GetStatusBarBorders().x +
+ m_renderer->GetStatusBarFieldMargins().x;
}
int wxStatusBarUniv::GetBorderY() const
{
- return m_renderer->GetStatusBarBorders(NULL).y;
+ return m_renderer->GetStatusBarBorders().y +
+ m_renderer->GetStatusBarFieldMargins().y;
}
#endif // wxUSE_STATUSBAR
projects / wxWidgets.git / blobdiff