X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aeb3c1cb523f18a93804c6cd67e00e8fe8699198..28169517b83648ffe43bccf9ac8e40f11d39c8c4:/src/univ/statusbr.cpp

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 71ffd980dd..8c817a5ab3 100644
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        univ/statusbr.cpp
+// Name:        src/univ/statusbr.cpp
 // Purpose:     wxStatusBar implementation
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univstatusbr.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -29,14 +25,14 @@
 
 #if wxUSE_STATUSBAR
 
+#include "wx/statusbr.h"
+
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/statusbr.h"
-#include "wx/toplevel.h"
-
 #include "wx/univ/renderer.h"
 
 // ============================================================================
@@ -68,16 +64,16 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
                            wxDefaultPosition, wxDefaultSize,
                            style, name) )
     {
-        return FALSE;
+        return false;
     }
 
     SetFieldsCount(1);
-    
+
     CreateInputHandler(wxINP_HANDLER_STATUSBAR);
 
     SetSize(DoGetBestSize());
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -90,7 +86,8 @@ wxRect wxStatusBarUniv::GetTotalFieldRect(wxCoord *borderBetweenFields)
 
     // no, don't do this - the borders are meant to be inside this rect
     // wxSize sizeBorders =
-    m_renderer->GetStatusBarBorders(borderBetweenFields);
+    if ( borderBetweenFields )
+        *borderBetweenFields = m_renderer->GetStatusBarBorderBetweenFields();
     //rect.Deflate(sizeBorders.x, sizeBorders.y);
 
     // recalc the field widths if needed
@@ -113,10 +110,11 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
 
     // prepare the DC
     wxDC& dc = renderer->GetDC();
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    dc.SetFont(GetFont());
+    dc.SetTextForeground(GetForegroundColour());
 
     // do draw the fields
-    int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED;
+    int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;
     for ( int n = 0; n < m_nFields; n++ )
     {
         rect.width = m_widthsAbs[n];
@@ -133,14 +131,15 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
                  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
-                //     (it's still ugly, of course, but there are too few flags
-                //     to squander them for things like this)
-                flags |= wxCONTROL_ISDEFAULT;
+                flags |= wxCONTROL_SIZEGRIP;
             }
 
-            m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags);
+            int style;
+            if (m_statusStyles)
+                style = m_statusStyles[n];
+            else
+                style = wxSB_NORMAL;
+            m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags, style);
         }
 
         rect.x += rect.width + borderBetweenFields;
@@ -178,7 +177,7 @@ void wxStatusBarUniv::SetStatusText(const wxString& text, int number)
 
 wxString wxStatusBarUniv::GetStatusText(int number) const
 {
-    wxCHECK_MSG( number >= 0 && number < m_nFields, _T(""),
+    wxCHECK_MSG( number >= 0 && number < m_nFields, wxEmptyString,
                  _T("invalid status bar field index") );
 
     return m_statusText[number];
@@ -249,7 +248,7 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event)
 
 bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
 {
-    wxCHECK_MSG( n >= 0 && n < m_nFields, FALSE,
+    wxCHECK_MSG( n >= 0 && n < m_nFields, false,
                  _T("invalid field index in GetFieldRect()") );
 
     // this is a fix for a bug exhibited by the statbar sample: if
@@ -260,7 +259,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
 
     rect = DoGetFieldRect(n);
 
-    return TRUE;
+    return true;
 }
 
 wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
@@ -288,10 +287,7 @@ wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
 
 wxCoord wxStatusBarUniv::GetHeight() const
 {
-    wxClientDC dc(wxConstCast(this, wxStatusBarUniv));
-    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-
-    return dc.GetCharHeight() + 2*GetBorderY();
+    return GetCharHeight() + 2*GetBorderY();
 }
 
 wxSize wxStatusBarUniv::DoGetBestSize() const
@@ -317,13 +313,14 @@ void wxStatusBarUniv::SetMinHeight(int WXUNUSED(height))
 
 int wxStatusBarUniv::GetBorderX() const
 {
-    return m_renderer->GetStatusBarBorders(NULL).x;
+    return m_renderer->GetStatusBarBorders().x +
+           m_renderer->GetStatusBarFieldMargins().x;
 }
 
 int wxStatusBarUniv::GetBorderY() const
 {
-    return m_renderer->GetStatusBarBorders(NULL).y;
+    return m_renderer->GetStatusBarBorders().y +
+           m_renderer->GetStatusBarFieldMargins().y;
 }
 
 #endif // wxUSE_STATUSBAR
-