X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..bb276f53fca627231b1e1f50550a314a5687650b:/src/univ/statusbr.cpp diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index 6e775a60fc..0acfa84277 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/statusbr.cpp +// Name: src/univ/statusbr.cpp // Purpose: wxStatusBar implementation // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "univstatusbr.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,14 +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/toplevel.h" - #include "wx/univ/renderer.h" // ============================================================================ @@ -68,7 +64,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent, wxDefaultPosition, wxDefaultSize, style, name) ) { - return FALSE; + return false; } SetFieldsCount(1); @@ -77,7 +73,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent, SetSize(DoGetBestSize()); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -90,7 +86,8 @@ wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields) // 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 @@ -99,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; @@ -113,11 +110,12 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer) // 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; - 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]; @@ -128,19 +126,15 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer) // 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; } - m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags); + m_renderer->DrawStatusField(dc, rect, GetStatusText(n), flags, m_panes[n].GetStyle()); } rect.x += rect.width + borderBetweenFields; @@ -162,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 @@ -190,8 +177,8 @@ wxString wxStatusBarUniv::GetStatusText(int number) const void wxStatusBarUniv::SetFieldsCount(int number, const int *widths) { - m_statusText.SetCount(number); wxStatusBarBase::SetFieldsCount(number, widths); + m_widthsAbs.Empty(); } @@ -210,25 +197,25 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event) { // 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 ) { - for ( field = 0; field < m_nFields; field++ ) + // hence all fields widths have changed + field = 0; + } + else + { + 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 @@ -249,7 +236,7 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event) 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 @@ -260,7 +247,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const rect = DoGetFieldRect(n); - return TRUE; + return true; } wxRect wxStatusBarUniv::DoGetFieldRect(int n) const @@ -288,10 +275,7 @@ wxRect wxStatusBarUniv::DoGetFieldRect(int n) const 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 @@ -317,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 -