/////////////////////////////////////////////////////////////////////////////
-// Name: univ/statusbr.cpp
+// Name: src/univ/statusbr.cpp
// Purpose: wxStatusBar implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 14.10.01
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "univstatusbr.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_STATUSBAR
+#include "wx/statusbr.h"
+
#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/dcclient.h"
+ #include "wx/toplevel.h"
#endif
-#include "wx/statusbr.h"
-#include "wx/toplevel.h"
-
#include "wx/univ/renderer.h"
// ============================================================================
wxDefaultPosition, wxDefaultSize,
style, name) )
{
- return FALSE;
+ return false;
}
SetFieldsCount(1);
SetSize(DoGetBestSize());
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// 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
// 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 : wxCONTROL_DISABLED;
+ int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;
for ( int n = 0; n < m_nFields; n++ )
{
rect.width = m_widthsAbs[n];
if ( IsExposed(rect) )
{
wxTopLevelWindow *parentTLW = wxDynamicCast(GetParent(), wxTopLevelWindow);
-
+
// 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
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;
}
- m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags);
+ int style;
+ if (m_statusStyles)
+ style = m_statusStyles[n];
+ else
+ style = wxSB_NORMAL;
+ m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags, style);
}
rect.x += rect.width + borderBetweenFields;
wxString wxStatusBarUniv::GetStatusText(int number) const
{
- wxCHECK_MSG( number >= 0 && number < m_nFields, _T(""),
+ wxCHECK_MSG( number >= 0 && number < m_nFields, wxEmptyString,
_T("invalid status bar field index") );
return m_statusText[number];
void wxStatusBarUniv::OnSize(wxSizeEvent& event)
{
- // invalidate the widths, we'll have to recalc them
- 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 )
+ {
+ for ( field = 0; field < m_nFields; field++ )
+ {
+ if ( m_statusWidths[field] < 0 )
+ {
+ // var width field
+ break;
+ }
+ }
+ }
+ else // all fields have the same width
+ {
+ // hence all fields widths have changed
+ field = 0;
+ }
- // refresh entirely, shouldn't matter much as the statusbar is quick to
- // redraw and it would be difficult to avoid it as we'd need to find out
- // which fields exactly were affected...
- Refresh();
+ if ( field < m_nFields )
+ {
+ // call this before invalidating the old widths as we want to use them,
+ // not the new ones
+ wxRect rect = DoGetFieldRect(field);
+
+ // invalidate the widths, we'll have to recalc them
+ m_widthsAbs.Empty();
+
+ // refresh everything after the first invalid field
+ rect.y = 0;
+ rect.SetRight(event.GetSize().x);
+ rect.height = event.GetSize().y;
+ RefreshRect(rect);
+ }
event.Skip();
}
bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
{
- wxCHECK_MSG( n >= 0 && n < m_nFields, FALSE,
+ wxCHECK_MSG( n >= 0 && n < m_nFields, false,
_T("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
// our geometry info is wrong as our OnSize() didn't invalidate m_widthsAbs
// yet - so recalc it just in case
+ wxConstCast(this, wxStatusBarUniv)->m_widthsAbs.Empty();
+
+ rect = DoGetFieldRect(n);
+
+ return true;
+}
+
+wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
+{
wxStatusBarUniv *self = wxConstCast(this, wxStatusBarUniv);
- self->m_widthsAbs.Empty();
wxCoord borderBetweenFields;
- rect = self->GetTotalFieldRect(&borderBetweenFields);
+ wxRect rect = self->GetTotalFieldRect(&borderBetweenFields);
+
+ // 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") );
+
for ( int i = 0; i <= n; i++ )
{
rect.width = m_widthsAbs[i];
rect.x += rect.width + borderBetweenFields;
}
- return TRUE;
+ return rect;
}
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