Added dialog tabbing to wxX11.

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 679e664bceb43ccd078cff1f1e1832fdc7a54a76..a4a98d952dd7d88a01419895a25cb1bacbabd834 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -30,9 +30,12 @@
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP
 #if wxUSE_STATUSBAR
 
 #ifndef WX_PRECOMP

+    #include "wx/settings.h"
+    #include "wx/dcclient.h"

 #endif
 
 #include "wx/statusbr.h"
 #endif
 
 #include "wx/statusbr.h"

+#include "wx/toplevel.h"

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


@@ -83,12 +86,11 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
 
 wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields)
 {
 
 wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields)
 {

-    // determine the space we have for the fields
-    wxSize sizeBorders = m_renderer->GetStatusBarBorders(borderBetweenFields);
-

     wxRect rect = GetClientRect();
 
     // no, don't do this - the borders are meant to be inside this rect
     wxRect rect = GetClientRect();
 
     // no, don't do this - the borders are meant to be inside this rect

+    // wxSize sizeBorders =
+    m_renderer->GetStatusBarBorders(borderBetweenFields);

     //rect.Deflate(sizeBorders.x, sizeBorders.y);
 
     // recalc the field widths if needed
     //rect.Deflate(sizeBorders.x, sizeBorders.y);
 
     // recalc the field widths if needed


@@ -111,7 +113,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
 
     // prepare the DC
     wxDC& dc = renderer->GetDC();
 
     // prepare the DC
     wxDC& dc = renderer->GetDC();

-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
     // do draw the fields
     int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED;
 
     // do draw the fields
     int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED;


@@ -121,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


@@ -185,9 +190,8 @@ wxString wxStatusBarUniv::GetStatusText(int number) const
 
 void wxStatusBarUniv::SetFieldsCount(int number, const int *widths)
 {
 
 void wxStatusBarUniv::SetFieldsCount(int number, const int *widths)
 {

-    wxStatusBarBase::SetFieldsCount(number, widths);
-

     m_statusText.SetCount(number);
     m_statusText.SetCount(number);

+    wxStatusBarBase::SetFieldsCount(number, widths);

     m_widthsAbs.Empty();
 }
 
     m_widthsAbs.Empty();
 }
 


@@ -243,7 +247,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
 wxCoord wxStatusBarUniv::GetHeight() const
 {
     wxClientDC dc(wxConstCast(this, wxStatusBarUniv));
 wxCoord wxStatusBarUniv::GetHeight() const
 {
     wxClientDC dc(wxConstCast(this, wxStatusBarUniv));

-    dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

 
     return dc.GetCharHeight() + 2*GetBorderY();
 }
 
     return dc.GetCharHeight() + 2*GetBorderY();
 }