fixed outdated filenames

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index f268c4372415e754a78c64dcc835adbccc54c932..3244ab7244188521c23fb938dec0a0626c18cafc 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"


@@ -31,16 +31,16 @@
 
 #include "wx/statusbr.h"
 
 
 #include "wx/statusbr.h"
 

-#ifdef __WXMSW__
-#include <windows.h>
-#include "wx/msw/winundef.h"
-#endif
+// we only have to do it here when we use wxStatusBarGeneric in addition to the
+// standard wxStatusBar class, if wxStatusBarGeneric is the same as
+// wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in
+// common/statbar.cpp
+#if defined(__WXMAC__) || \
+    (defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR)
+    #include "wx/generic/statusbr.h"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
-
-#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
-    IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBarGeneric)
-#endif // Win32 && wxUSE_NATIVE_STATUSBAR
+    IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
+#endif // wxUSE_NATIVE_STATUSBAR

 
 BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
     EVT_PAINT(wxStatusBarGeneric::OnPaint)
 
 BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
     EVT_PAINT(wxStatusBarGeneric::OnPaint)


@@ -66,8 +66,6 @@ wxStatusBarGeneric::~wxStatusBarGeneric()
         SetFont(wxNullFont);
 #   endif // MSW
 
         SetFont(wxNullFont);
 #   endif // MSW
 

-    if ( m_statusWidths )
-        delete[] m_statusWidths;

     if ( m_statusStrings )
         delete[] m_statusStrings;
 }
     if ( m_statusStrings )
         delete[] m_statusStrings;
 }


@@ -95,37 +93,61 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
   SetFont(m_defaultStatusBarFont);
 
 
   SetFont(m_defaultStatusBarFont);
 

+  // Set the height according to the font and the border size
+  wxClientDC dc(this);
+  dc.SetFont(GetFont());
+
+  wxCoord y;
+  dc.GetTextExtent(_T("X"), NULL, &y );
+
+  int height = (int)( (11*y)/10 + 2*GetBorderY());
+
+  SetSize(-1, -1, -1, height);
+

   return success;
 }
 
   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;
         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 ( 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();
+#ifdef __WXMAC__
+    int major,minor;
+    wxGetOsVersion( &major, &minor );
+
+    if (major >= 10)
+    {
+        Refresh();
+        return;
+    }
+#endif
+
+    wxRect rect;
+    GetFieldRect(number, rect);
+    wxClientDC dc(this);
+
+    dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
+    dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
+    dc.Clear();
+    dc.DestroyClippingRegion();
+    dc.SetFont(GetFont());
+    DrawFieldText( dc, number );

 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const


@@ -138,46 +160,66 @@ 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;
+        Refresh();
+        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];

     }
     }

-  }
+    Refresh();

 }
 
 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("LIGHT 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)


@@ -221,6 +263,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);


@@ -234,6 +278,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);
 }


@@ -245,7 +308,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;


@@ -313,18 +380,31 @@ void wxStatusBarGeneric::InitColours()
 {
     // Shadow colours
 #if defined(__WIN95__)
 {
     // Shadow colours
 #if defined(__WIN95__)

-    wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+    wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));

     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
 
     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
 

-    wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
+    wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));

     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);

+#elif defined(__WXPM__)
+    m_mediumShadowPen = wxPen("DARK GREY", 1, wxSOLID);
+    m_hilightPen = wxPen("WHITE", 1, wxSOLID);
+
+    wxColour                        vColour;
+
+    vColour.Set(wxString("LIGHT GREY"));
+    SetBackgroundColour(vColour);
+    vColour.Set(wxString("BLACK"));
+    SetForegroundColour(vColour);
+    m_defaultStatusBarFont = *wxSMALL_FONT;

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

-    m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+#ifndef __WXPM__
+    m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+#endif

 }
 
 // Responds to colour changes, and passes event on to children.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -351,4 +431,4 @@ void wxStatusBarGeneric::SetMinHeight(int height)
     }
 }
 
     }
 }
 

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