OS/2 Statusbar fixes

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index de2d7df9409606f07be7060d89a7043564d2abed..a65e6c1e5c13b518f296f86b48ad00c8832d19b5 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -29,12 +29,10 @@
 #include "wx/dcclient.h"
 #endif
 
-#include "wx/generic/statusbr.h"
+#include "wx/statusbr.h"
 
-#ifdef __WXMSW__
-#include <windows.h>
-#include "wx/msw/winundef.h"
-#endif
+// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h
+#include "wx/generic/statusbr.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
 
@@ -82,6 +80,7 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
   m_nFields = 0;
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
+  m_themeEnabled = TRUE;
 
   bool success = wxWindow::Create(parent, id,
                                   wxDefaultPosition, wxDefaultSize,
@@ -98,34 +97,33 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
   return success;
 }
 
-void wxStatusBarGeneric::SetFieldsCount(int number, const int widths[])
+void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {
-  m_nFields = number;
-
-  if ( m_statusWidths )
-    delete[] m_statusWidths;
+    if ( number != m_nFields )
+    {
+        m_nFields = number;
 
-  if ( m_statusStrings )
         delete[] m_statusStrings;
+        m_statusStrings = new wxString[number];
 
-  m_statusStrings = new wxString[number];
-
-  int i;
-  for (i = 0; i < number; i++)
-    m_statusStrings[i] = "";
+#if 0 // VZ: what is this for?
+        int i;
+        for (i = 0; i < number; i++)
+            m_statusStrings[i] = "";
+#endif
+    }
 
-  if ( widths )
-      SetStatusWidths(number, widths);
+    SetStatusWidths(number, widths);
 }
 
 void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
 {
-  if ((number < 0) || (number >= m_nFields))
-    return;
+    wxCHECK_RET( (number >= 0) && (number < m_nFields),
+                 _T("invalid status bar field index") );
 
-  m_statusStrings[number] = text;
+    m_statusStrings[number] = text;
 
-  Refresh();
+    Refresh();
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const
@@ -138,29 +136,40 @@ wxString wxStatusBarGeneric::GetStatusText(int n) const
 
 void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
 {
-  // only set status widths, when n == number of statuswindows
-  if (n == m_nFields)
-  {
-    // only set status widths,
+    // only set status widths, when n == number of statuswindows
+    wxCHECK_RET( n == m_nFields, _T("status bar field count mismatch") );
+
+    // delete the old widths in any case - this function may be used to reset
+    // the widths to the default (all equal)
+    delete [] m_statusWidths;
+
+    if ( !widths_field )
+    {
+        // not an error, see the comment above
+        m_statusWidths = (int *)NULL;
+
+        return;
+    }
+
+    int i;
+
+    // VZ: this doesn't do anything as is_variable is unused later
+#if 0
     // when one window (minimum) is variable (width <= 0)
     bool is_variable = FALSE;
-    int i;
     for (i = 0; i < m_nFields; i++)
     {
-      if (widths_field[i] <= 0) is_variable = TRUE;
+        if (widths_field[i] <= 0)
+            is_variable = TRUE;
     }
-
-    // if there are old widths, delete them
-    if (m_statusWidths)
-      delete [] m_statusWidths;
+#endif // 0
 
     // set widths
     m_statusWidths = new int[n];
     for (i = 0; i < m_nFields; i++)
     {
-      m_statusWidths[i] = widths_field[i];
+        m_statusWidths[i] = widths_field[i];
     }
-  }
 }
 
 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
@@ -171,6 +180,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
   if ( GetFont().Ok() )
     dc.SetFont(GetFont());
   dc.SetBackgroundMode(wxTRANSPARENT);
+  dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
 
   for ( i = 0; i < m_nFields; i ++ )
     DrawField(dc, i);
@@ -312,7 +322,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 void wxStatusBarGeneric::InitColours()
 {
     // Shadow colours
-#if defined(__WIN95__)
+#ifndef __WIN16__
     wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);