When inserting a new menu don't try to find th eposition of the current one

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 143b6fcde885b2e9967c2dfa01ebdad0bdaec5ca..71ffd980dddc989fd360043618d108183025dadf 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -6,7 +6,7 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univstatusbr.h"
 #endif
 
     #pragma implementation "univstatusbr.h"
 #endif
 


@@ -35,6 +35,7 @@
 #endif
 
 #include "wx/statusbr.h"
 #endif
 
 #include "wx/statusbr.h"

+#include "wx/toplevel.h"

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 


@@ -71,7 +72,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
     }
 
     SetFieldsCount(1);
     }
 
     SetFieldsCount(1);

-
+    

     CreateInputHandler(wxINP_HANDLER_STATUSBAR);
 
     SetSize(DoGetBestSize());
     CreateInputHandler(wxINP_HANDLER_STATUSBAR);
 
     SetSize(DoGetBestSize());


@@ -122,12 +123,15 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
 
         if ( IsExposed(rect) )
         {
 
         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 &&
                  HasFlag(wxST_SIZEGRIP) &&
             // 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) &&

-                 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
             {
                 // NB: we use wxCONTROL_ISDEFAULT for this because it doesn't
                 //     have any meaning for the status bar otherwise anyhow


@@ -204,13 +208,41 @@ void wxStatusBarUniv::SetStatusWidths(int n, const int widths[])
 
 void wxStatusBarUniv::OnSize(wxSizeEvent& event)
 {
 
 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
+    int field;
+    if ( m_statusWidths )
+    {
+        for ( field = 0; field < m_nFields; field++ )
+        {
+            if ( m_statusWidths[field] < 0 )
+            {
+                // var width field
+                break;
+            }
+        }
+    }
+    else // all fields have the same width
+    {
+        // hence all fields widths have changed
+        field = 0;
+    }
+
+    if ( field < m_nFields )
+    {
+        // call this before invalidating the old widths as we want to use them,
+        // not the new ones
+        wxRect rect = DoGetFieldRect(field);

 
 

-    // 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();
+        // 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();
 }
 
     event.Skip();
 }


@@ -224,11 +256,25 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
     // 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
     // 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);
     wxStatusBarUniv *self = wxConstCast(this, wxStatusBarUniv);

-    self->m_widthsAbs.Empty();

 
     wxCoord borderBetweenFields;
 
     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];
     for ( int i = 0; i <= n; i++ )
     {
         rect.width = m_widthsAbs[i];


@@ -237,7 +283,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
             rect.x += rect.width + borderBetweenFields;
     }
 
             rect.x += rect.width + borderBetweenFields;
     }
 

-    return TRUE;
+    return rect;

 }
 
 wxCoord wxStatusBarUniv::GetHeight() const
 }
 
 wxCoord wxStatusBarUniv::GetHeight() const