Override email address for Jaakko Salli.

[wxWidgets.git] / src / univ / statusbr.cpp

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 071237016be9e960520980fd5a444cac97c33ee4..0acfa84277bfc89c2efa8c30c3c3b7a7a4f8384d 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -127,14 +127,14 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
             // have the corresponding style and even then only if we really can
             // resize this frame
             if ( n == (int)m_panes.GetCount() - 1 &&
-                 HasFlag(wxST_SIZEGRIP) &&
+                 HasFlag(wxSTB_SIZEGRIP) &&
                  GetParent()->HasFlag(wxRESIZE_BORDER) &&
                  parentTLW && !parentTLW->IsMaximized() )
             {
                 flags |= wxCONTROL_SIZEGRIP;
             }
 
-            m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags, m_panes[n].nStyle);
+            m_renderer->DrawStatusField(dc, rect, GetStatusText(n), flags, m_panes[n].GetStyle());
         }
 
         rect.x += rect.width + borderBetweenFields;
@@ -159,24 +159,17 @@ 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 == 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 && (size_t)number < m_panes.GetCount(), wxEmptyString,
-                 _T("invalid status bar field index") );
-
-    return m_statusText[number];
-}
 
 // ----------------------------------------------------------------------------
 // fields count/widths
@@ -184,7 +177,6 @@ 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();
@@ -215,7 +207,7 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event)
     {
         for ( field = 0; field < m_panes.GetCount(); field++ )
         {
-            if ( m_panes[field].nWidth < 0 )
+            if ( m_panes[field].GetWidth() < 0 )
             {
                 // var width field
                 break;