Corrected wxScrolledWindow's OnSize behaviour.

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index ac3656e4331cd5aa3b2304339d2fe485405554cf..e1739aa5c326d84aad43d5e4523959f8a14b865c 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
+#if wxUSE_STATUSBAR

 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"


@@ -98,32 +98,31 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
 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;
         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)
 {
 }
 
 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
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const


@@ -136,46 +135,65 @@ wxString wxStatusBarGeneric::GetStatusText(int n) const
 
 void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
 {
 
 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;
     // when one window (minimum) is variable (width <= 0)
     bool is_variable = FALSE;

-    int i;

     for (i = 0; i < m_nFields; 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++)
     {
 
     // 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) )
 {
   wxPaintDC dc(this);
 
 }
 
 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
   wxPaintDC dc(this);
 

+

   int i;
   if ( GetFont().Ok() )
     dc.SetFont(GetFont());
   dc.SetBackgroundMode(wxTRANSPARENT);
 
   int i;
   if ( GetFont().Ok() )
     dc.SetFont(GetFont());
   dc.SetBackgroundMode(wxTRANSPARENT);
 

+#ifdef __WXPM__
+  wxColour                          vColor;
+
+  vColor.InitFromName("GREY");
+  ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
+#endif
+

   for ( i = 0; i < m_nFields; i ++ )
     DrawField(dc, i);
 
   for ( i = 0; i < m_nFields; i ++ )
     DrawField(dc, i);
 

-#   ifdef __WXMSW__
-        dc.SetFont(wxNullFont);
-#   endif // MSW
+#ifdef __WXMSW__
+  dc.SetFont(wxNullFont);
+#endif // MSW

 }
 
 void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
 }
 
 void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)


@@ -219,6 +237,8 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
 
     dc.SetPen(m_hilightPen);
 
 
     dc.SetPen(m_hilightPen);
 

+#ifndef __WXPM__
+

     // Right and bottom white lines
     dc.DrawLine(rect.x + rect.width, rect.y,
                 rect.x + rect.width, rect.y + rect.height);
     // Right and bottom white lines
     dc.DrawLine(rect.x + rect.width, rect.y,
                 rect.x + rect.width, rect.y + rect.height);


@@ -232,6 +252,25 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
            rect.x, rect.y);
     dc.DrawLine(rect.x, rect.y,
         rect.x + rect.width, rect.y);
            rect.x, rect.y);
     dc.DrawLine(rect.x, rect.y,
         rect.x + rect.width, rect.y);

+#else
+    // Right
+    dc.DrawLine(rect.x + rect.width, rect.y,
+                rect.x + rect.width, rect.y + rect.height + 2);
+    dc.SetPen(m_mediumShadowPen);
+    dc.DrawLine(rect.x + rect.width + 1, rect.y,
+                rect.x + rect.width + 1, rect.y + rect.height + 2);
+    dc.DrawLine(rect.x + rect.width + 2, rect.y,
+                rect.x + rect.width + 2, rect.y + rect.height + 2);
+    // Top
+    dc.DrawLine(rect.x + rect.width + 2, rect.y,
+                rect.x - 2, rect.y);
+    dc.DrawLine(rect.x + rect.width + 1, rect.y - 1,
+                rect.x - 2, rect.y - 1);
+    dc.SetPen(m_hilightPen);
+    dc.DrawLine(rect.x + rect.width, rect.y - 2,
+                rect.x - 2, rect.y - 2);
+
+#endif

 
     DrawFieldText(dc, i);
 }
 
     DrawFieldText(dc, i);
 }


@@ -243,7 +282,11 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
                _T("invalid status bar field index") );
 
   int width, height;
                _T("invalid status bar field index") );
 
   int width, height;

+#ifdef __WXPM__
+  GetSize(&width, &height);
+#else

   GetClientSize(&width, &height);
   GetClientSize(&width, &height);

+#endif

 
   int i;
   int sum_of_nonvar = 0;
 
   int i;
   int sum_of_nonvar = 0;


@@ -316,6 +359,9 @@ void wxStatusBarGeneric::InitColours()
 
     wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 
     wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);

+#elif defined(__WXPM__)
+    m_mediumShadowPen = wxPen("LIGHT GREY", 1, wxSOLID);
+    m_hilightPen = wxPen("WHITE", 1, wxSOLID);

 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);


@@ -349,4 +395,4 @@ void wxStatusBarGeneric::SetMinHeight(int height)
     }
 }
 
     }
 }
 

-//#endif // Win32 && wxUSE_NATIVE_STATUSBAR
+#endif // wxUSE_STATUSBAR