fixed crash on invalid data (patch 1039453)

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

diff --git a/src/univ/statusbr.cpp b/src/univ/statusbr.cpp
index 2cd0e48d45676337847216bc728a93f96ce3312f..75b4c135cd5744acb9c6db314d42a389d88302a2 100644 (file)
--- a/src/univ/statusbr.cpp
+++ b/src/univ/statusbr.cpp
@@ -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
 


@@ -68,16 +68,16 @@ bool wxStatusBarUniv::Create(wxWindow *parent,
                            wxDefaultPosition, wxDefaultSize,
                            style, name) )
     {
                            wxDefaultPosition, wxDefaultSize,
                            style, name) )
     {

-        return FALSE;
+        return false;

     }
 
     SetFieldsCount(1);
     }
 
     SetFieldsCount(1);

-
+    

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

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -140,7 +140,12 @@ void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
                 flags |= wxCONTROL_ISDEFAULT;
             }
 
                 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;
         }
 
         rect.x += rect.width + borderBetweenFields;


@@ -249,7 +254,7 @@ void wxStatusBarUniv::OnSize(wxSizeEvent& event)
 
 bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
 {
 
 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
                  _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);
 
 
     rect = DoGetFieldRect(n);
 

-    return TRUE;
+    return true;

 }
 
 wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
 }
 
 wxRect wxStatusBarUniv::DoGetFieldRect(int n) const