X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4c178c10d070e20d537f3d685a31115b3b2d4c9..4e15d1caa03346c126015019c1fdf093033ef40b:/src/univ/statusbr.cpp?ds=sidebyside diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp index 0acfa84277..ac0dbc3fa9 100644 --- a/src/univ/statusbr.cpp +++ b/src/univ/statusbr.cpp @@ -141,7 +141,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer) } } -void wxStatusBarUniv::RefreshField(int i) +void wxStatusBarUniv::DoUpdateStatusText(int i) { wxRect rect; if ( GetFieldRect(i, rect) ) @@ -150,27 +150,6 @@ void wxStatusBarUniv::RefreshField(int i) } } -// ---------------------------------------------------------------------------- -// fields text -// ---------------------------------------------------------------------------- - -void wxStatusBarUniv::SetStatusText(const wxString& text, int number) -{ - wxCHECK_RET( number >= 0 && (size_t)number < m_panes.GetCount(), - _T("invalid status bar field index in SetStatusText()") ); - - if ( text == GetStatusText(number) ) - { - // nothing changed - return; - } - - wxStatusBarBase::SetStatusText(text, number); - - RefreshField(number); -} - - // ---------------------------------------------------------------------------- // fields count/widths // ---------------------------------------------------------------------------- @@ -237,7 +216,7 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event) bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const { wxCHECK_MSG( n >= 0 && (size_t)n < m_panes.GetCount(), false, - _T("invalid field index in GetFieldRect()") ); + 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 @@ -260,7 +239,7 @@ wxRect wxStatusBarUniv::DoGetFieldRect(int n) const // 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++ ) {