X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe9fea7ec75fe38527702b8ae7926a5609828b79..acd32ffcdb319f162633c20e0202db3f8542998a:/src/univ/statusbr.cpp diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index 62f7257458..6b70e2e7f6 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univstatusbr.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,13 +25,14 @@ #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/univ/renderer.h" // ============================================================================ @@ -67,7 +64,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent, wxDefaultPosition, wxDefaultSize, style, name) ) { - return FALSE; + return false; } SetFieldsCount(1); @@ -76,7 +73,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent, SetSize(DoGetBestSize()); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -88,6 +85,9 @@ wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields) wxRect rect = GetClientRect(); // no, don't do this - the borders are meant to be inside this rect + // wxSize sizeBorders = + if ( borderBetweenFields ) + *borderBetweenFields = m_renderer->GetStatusBarBorderBetweenFields(); //rect.Deflate(sizeBorders.x, sizeBorders.y); // recalc the field widths if needed @@ -96,7 +96,7 @@ wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields) // 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; @@ -110,31 +110,31 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer) // prepare the DC wxDC& dc = renderer->GetDC(); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + dc.SetFont(GetFont()); + dc.SetTextForeground(GetForegroundColour()); // do draw the fields - int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED; - for ( int n = 0; n < m_nFields; n++ ) + int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED; + for ( int n = 0; n < (int)m_panes.GetCount(); 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 - if ( n == m_nFields - 1 && + if ( n == (int)m_panes.GetCount() - 1 && HasFlag(wxST_SIZEGRIP) && - GetParent()->HasFlag(wxRESIZE_BORDER) ) + 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); + m_renderer->DrawStatusField(dc, rect, GetStatusText(n), flags, m_panes[n].nStyle); } rect.x += rect.width + borderBetweenFields; @@ -156,27 +156,20 @@ void wxStatusBarUniv::RefreshField(int i) void wxStatusBarUniv::SetStatusText(const wxString& text, int number) { - wxCHECK_RET( number >= 0 && number < m_nFields, + wxCHECK_RET( number >= 0 && (size_t)number < m_panes.GetCount(), _T("invalid status bar field index in SetStatusText()") ); - if ( text == m_statusText[number] ) + if ( text == GetStatusText(number) ) { // nothing changed return; } - m_statusText[number] = text; + wxStatusBarBase::SetStatusText(text, number); RefreshField(number); } -wxString wxStatusBarUniv::GetStatusText(int number) const -{ - wxCHECK_MSG( number >= 0 && number < m_nFields, _T(""), - _T("invalid status bar field index") ); - - return m_statusText[number]; -} // ---------------------------------------------------------------------------- // fields count/widths @@ -186,7 +179,6 @@ void wxStatusBarUniv::SetFieldsCount(int number, const int *widths) { wxStatusBarBase::SetFieldsCount(number, widths); - m_statusText.SetCount(number); m_widthsAbs.Empty(); } @@ -203,31 +195,73 @@ void wxStatusBarUniv::SetStatusWidths(int n, const int widths[]) 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 + size_t field; + if ( m_bSameWidthForAllPanes ) + { + // hence all fields widths have changed + field = 0; + } + else + { + for ( field = 0; field < m_panes.GetCount(); field++ ) + { + if ( m_panes[field].nWidth < 0 ) + { + // var width field + break; + } + } + } - // 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_panes.GetCount() ) + { + // 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 && (size_t)n < m_panes.GetCount(), 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]; @@ -236,15 +270,12 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const rect.x += rect.width + borderBetweenFields; } - return TRUE; + return rect; } wxCoord wxStatusBarUniv::GetHeight() const { - wxClientDC dc(wxConstCast(this, wxStatusBarUniv)); - dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); - - return dc.GetCharHeight() + 2*GetBorderY(); + return GetCharHeight() + 2*GetBorderY(); } wxSize wxStatusBarUniv::DoGetBestSize() const @@ -270,13 +301,14 @@ void wxStatusBarUniv::SetMinHeight(int WXUNUSED(height)) 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 -