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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 71ffd980dd..75b4c135cd 100644
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -68,7 +68,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
                            wxDefaultPosition, wxDefaultSize,
                            style, name) )
     {
-        return FALSE;
+        return false;
     }
 
     SetFieldsCount(1);
@@ -77,7 +77,7 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
 
     SetSize(DoGetBestSize());
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -140,7 +140,12 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
                 flags |= wxCONTROL_ISDEFAULT;
             }
 
-            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;
@@ -249,7 +254,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 +265,7 @@ bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
 
     rect = DoGetFieldRect(n);
 
-    return TRUE;
+    return true;
 }
 
 wxRect wxStatusBarUniv::DoGetFieldRect(int n) const