Correct bug in the wxSpinCtrlGeneric sub-controls resizing.

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 071237016be9e960520980fd5a444cac97c33ee4..ac0dbc3fa9a29661fefcf8bb47e4a0a6768c2d81 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -127,21 +127,21 @@ 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 &&
             // 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;
             }
 
                  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;
     }
 }
 
         }
 
         rect.x += rect.width + borderBetweenFields;
     }
 }
 

-void wxStatusBarUniv::RefreshField(int i)
+void wxStatusBarUniv::DoUpdateStatusText(int i)

 {
     wxRect rect;
     if ( GetFieldRect(i, rect) )
 {
     wxRect rect;
     if ( GetFieldRect(i, rect) )


@@ -150,41 +150,12 @@ 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 == m_statusText[number] )
-    {
-        // nothing changed
-        return;
-    }
-
-    m_statusText[number] = text;
-
-    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
 // ----------------------------------------------------------------------------
 
 void wxStatusBarUniv::SetFieldsCount(int number, const int *widths)
 {
 // ----------------------------------------------------------------------------
 // fields count/widths
 // ----------------------------------------------------------------------------
 
 void wxStatusBarUniv::SetFieldsCount(int number, const int *widths)
 {

-    m_statusText.SetCount(number);

     wxStatusBarBase::SetFieldsCount(number, widths);
 
     m_widthsAbs.Empty();
     wxStatusBarBase::SetFieldsCount(number, widths);
 
     m_widthsAbs.Empty();


@@ -215,7 +186,7 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event)
     {
         for ( field = 0; field < m_panes.GetCount(); field++ )
         {
     {
         for ( field = 0; field < m_panes.GetCount(); field++ )
         {

-            if ( m_panes[field].nWidth < 0 )
+            if ( m_panes[field].GetWidth() < 0 )

             {
                 // var width field
                 break;
             {
                 // var width field
                 break;


@@ -245,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,
 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
 
     // this is a fix for a bug exhibited by the statbar sample: if
     // GetFieldRect() is called from the derived class OnSize() handler, then


@@ -268,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,
     // 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++ )
     {
 
     for ( int i = 0; i <= n; i++ )
     {