fixed bug due to missing break in GetColourFromGTKWidget() (part of patch 1160117)

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 2cd0e48d45676337847216bc728a93f96ce3312f..15485a18a1143ad71425b1537056eb245e978fd3 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univstatusbr.h"
 #endif
 
@@ -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;
 }
 
 // ----------------------------------------------------------------------------
@@ -116,7 +116,7 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
     dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
     // 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];
@@ -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;
@@ -178,7 +183,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 +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