Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index d2f31f0096ffa8fe5be74999d0e5b362ad5d3884..24f273375d81058090674a4374210eb1c89ad402 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statusbr.cpp
-// Purpose:     wxStatusBar class implementation
+// Name:        generic/statusbr.cpp
+// Purpose:     wxStatusBarGeneric class implementation

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_STATUSBAR
+

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


@@ -27,162 +29,178 @@
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/dcclient.h"
 #endif
 

-#include "wx/generic/statusbr.h"
-
-#ifdef __WINDOWS__
-#include <windows.h>
-
-#ifdef DrawText
-#undef DrawText
-#endif
+#include "wx/statusbr.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"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
+    IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
+#endif // wxUSE_NATIVE_STATUSBAR

 
 

-BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
-       EVT_PAINT(wxStatusBar::OnPaint)
-    EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
+    EVT_PAINT(wxStatusBarGeneric::OnPaint)
+    EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged)

 END_EVENT_TABLE()
 END_EVENT_TABLE()

-#endif

 
 // Default status border dimensions
 #define         wxTHICK_LINE_BORDER 2
 #define         wxTHICK_LINE_WIDTH  1
 
 
 // Default status border dimensions
 #define         wxTHICK_LINE_BORDER 2
 #define         wxTHICK_LINE_WIDTH  1
 

-wxStatusBar::wxStatusBar(void)
+wxStatusBarGeneric::wxStatusBarGeneric()

 {
 {

-  m_statusWidths = NULL;
-  m_statusStrings = NULL;
-  m_nFields = 0;

   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 }
 
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 }
 

-wxStatusBar::~wxStatusBar(void)
+wxStatusBarGeneric::~wxStatusBarGeneric()

 {
 {

-    SetFont(wxNullFont);
-
-       if ( m_statusWidths )
-               delete[] m_statusWidths;
-       if ( m_statusStrings )
-               delete[] m_statusStrings;
+#   ifdef __WXMSW__
+        SetFont(wxNullFont);
+#   endif // MSW

 }
 
 }
 

-bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
-           const wxPoint& pos,
-           const wxSize& size,
-           const long style,
-           const wxString& name)
+bool wxStatusBarGeneric::Create(wxWindow *parent,
+                                wxWindowID id,
+                                long style,
+                                const wxString& name)

 {
 {

-  m_statusWidths = NULL;
-  m_statusStrings = NULL;
-  m_nFields = 0;
+    // If create is ever meant to be re-entrant over the life of
+    // an object we should:
+    // m_statusStrings.Empty();
+

   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 

-  bool success = wxWindow::Create(parent, id, pos, size, style, name);
+  bool success = wxWindow::Create(parent, id,
+                                  wxDefaultPosition, wxDefaultSize,
+                                  style | wxTAB_TRAVERSAL, name);

 
 

-  // Don't wish this to be found as a child
-  parent->GetChildren()->DeleteObject(this);
+  // The status bar should have a themed background
+  SetThemeEnabled( TRUE );

 
 

+  // Don't wish this to be found as a child
+#ifndef __WXMAC__
+  parent->GetChildren().DeleteObject(this);
+#endif

   InitColours();
 
   SetFont(m_defaultStatusBarFont);
 
   InitColours();
 
   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 wxStatusBar::SetFieldsCount(const int number, const int *widths)
+void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)

 {
 {

-  m_nFields = number;
+    wxASSERT_MSG( number >= 0,
+                  _T("Yes, number should be a size_t and less than no fields is silly.") );

 
 

-  if ( m_statusWidths )
-       delete[] m_statusWidths;
+    // if( number > m_nFields )

 
 

-  if ( m_statusStrings )
-               delete[] m_statusStrings;
+    int i;
+    for(i = m_nFields; i < number; ++i)
+        m_statusStrings.Add( wxEmptyString );

 
 

-  m_statusStrings = new wxString[number];
+    // if( number < m_nFields )

 
 

-  int i;
-  for (i = 0; i < number; i++)
-       m_statusStrings[i] = "";
+    for (i = m_nFields - 1; i >= number; --i)
+        m_statusStrings.Remove(i);
+
+    m_nFields = number;
+
+    wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
+                  _T("This really should never happen, can we do away with m_nFields here?") );

 
 

-       if ( widths )
-               SetStatusWidths(number, widths);
+    SetStatusWidths(number, widths);

 }
 
 }
 

-void wxStatusBar::SetStatusText(const wxString& text, const 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();
+    wxRect rect;
+    GetFieldRect(number, rect);

 
 

-#ifdef __WINDOWS__
-  // For some reason, this can cause major GDI problems - graphics
-  // all over the place. E.g. in print previewing.
-//  ::UpdateWindow((HWND) GetHWND());
-#endif
+    Refresh( TRUE, &rect );

 }
 
 }
 

-wxString wxStatusBar::GetStatusText(const int n) const
+wxString wxStatusBarGeneric::GetStatusText(int n) const

 {
 {

-  if ((n < 0) || (n >= m_nFields))
-    return wxString("");
-  else
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), wxEmptyString,
+                 _T("invalid status bar field index") );
+

     return m_statusStrings[n];
 }
 
     return m_statusStrings[n];
 }
 

-void wxStatusBar::SetStatusWidths(const 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,
-    // 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;
-    }
+    // only set status widths, when n == number of statuswindows
+    wxCHECK_RET( n == m_nFields, _T("status bar field count mismatch") );

 
 

-    // if there are old widths, delete them
-    if (m_statusWidths)
-      delete [] m_statusWidths;
+    // delete the old widths in any case - this function may be used to reset
+    // the widths to the default (all equal)
+    // MBN: this is incompatible with at least wxMSW and wxMAC and not
+    //      documented, but let's keep it for now
+    ReinitWidths();

 
 

-    // set widths
-    m_statusWidths = new int[n];
-    for (i = 0; i < m_nFields; i++)
+    if ( !widths_field )

     {
     {

-      m_statusWidths[i] = widths_field[i];
+        // not an error, see the comment above
+        Refresh();
+        return;

     }
     }

-  }
+
+    wxStatusBarBase::SetStatusWidths(n, widths_field);

 }
 
 }
 

-void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) )
+void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )

 {
   wxPaintDC dc(this);
 
 {
   wxPaintDC dc(this);
 

+

   int i;
   int i;

-  if ( GetFont() )
-    dc.SetFont(*GetFont());
+  if ( GetFont().Ok() )
+    dc.SetFont(GetFont());

   dc.SetBackgroundMode(wxTRANSPARENT);
 
   dc.SetBackgroundMode(wxTRANSPARENT);
 

+#ifdef __WXPM__
+  wxColour                          vColor;
+
+  vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
+  ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
+#endif
+

   for ( i = 0; i < m_nFields; i ++ )
   for ( i = 0; i < m_nFields; i ++ )

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

 }
 
 }
 

-void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
+void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)

 {
   int leftMargin = 2;
 
 {
   int leftMargin = 2;
 

-  wxRectangle rect;
+  wxRect rect;

   GetFieldRect(i, rect);
 
   wxString text(GetStatusText(i));
   GetFieldRect(i, rect);
 
   wxString text(GetStatusText(i));


@@ -194,6 +212,11 @@ void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
   int xpos = rect.x + leftMargin;
   int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
 
   int xpos = rect.x + leftMargin;
   int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
 

+#if defined( __WXGTK__ ) || defined(__WXMAC__)
+  xpos++;
+  ypos++;
+#endif
+

   dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
 
   dc.DrawText(text, xpos, ypos);
   dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
 
   dc.DrawText(text, xpos, ypos);


@@ -201,9 +224,9 @@ void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
   dc.DestroyClippingRegion();
 }
 
   dc.DestroyClippingRegion();
 }
 

-void wxStatusBar::DrawField(wxDC& dc, const int i)
+void wxStatusBarGeneric::DrawField(wxDC& dc, int i)

 {
 {

-  wxRectangle rect;
+  wxRect rect;

   GetFieldRect(i, rect);
 
     // Draw border
   GetFieldRect(i, rect);
 
     // Draw border


@@ -212,33 +235,53 @@ void wxStatusBar::DrawField(wxDC& dc, const int i)
     // Inside this, left and top sides - dark grey. Bottom and right -
     // white.
 
     // Inside this, left and top sides - dark grey. Bottom and right -
     // white.
 

-       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);
     dc.DrawLine(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);
     dc.DrawLine(rect.x + rect.width, rect.y + rect.height,

-                               rect.x, rect.y + rect.height);
+                rect.x, rect.y + rect.height);

 
 

-       dc.SetPen(m_mediumShadowPen);
+    dc.SetPen(m_mediumShadowPen);

 
     // Left and top grey lines
     dc.DrawLine(rect.x, rect.y + rect.height,
 
     // Left and top grey lines
     dc.DrawLine(rect.x, rect.y + rect.height,

-               rect.x, rect.y);
+           rect.x, rect.y);

     dc.DrawLine(rect.x, rect.y,
     dc.DrawLine(rect.x, rect.y,

-               rect.x + rect.width, rect.y);
+        rect.x + rect.width, rect.y);
+#else

 
 

-       DrawFieldText(dc, i);
+    dc.DrawLine(rect.x + rect.width, rect.height + 2,
+                rect.x, rect.height + 2);
+    dc.DrawLine(rect.x + rect.width, rect.y,
+                rect.x + rect.width, rect.y + rect.height);
+
+    dc.SetPen(m_mediumShadowPen);
+    dc.DrawLine(rect.x, rect.y,
+                rect.x + rect.width, rect.y);
+    dc.DrawLine(rect.x, rect.y + rect.height,
+                rect.x, rect.y);
+
+#endif
+
+    DrawFieldText(dc, i);

 }
 
   // Get the position and size of the field's internal bounding rectangle
 }
 
   // Get the position and size of the field's internal bounding rectangle

-bool wxStatusBar::GetFieldRect(const int n, wxRectangle& rect) const
+bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const

 {
 {

-  if ((n < 0) || (n >= m_nFields))
-    return FALSE;
+  wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE,
+               _T("invalid status bar field index") );

 
   int width, height;
 
   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;


@@ -265,9 +308,9 @@ bool wxStatusBar::GetFieldRect(const int n, wxRectangle& rect) const
     for (i = 0; i < m_nFields; i++)
     {
       fieldWidth = (int)(width/m_nFields);
     for (i = 0; i < m_nFields; i++)
     {
       fieldWidth = (int)(width/m_nFields);

-         fieldPosition = i*fieldWidth;
-         if ( i == n )
-               break;
+      fieldPosition = i*fieldWidth;
+      if ( i == n )
+        break;

     }
   }
   else // no_same_width
     }
   }
   else // no_same_width


@@ -281,47 +324,60 @@ bool wxStatusBar::GetFieldRect(const int n, wxRectangle& rect) const
     }
     for (i = 0; i < m_nFields; i++)
     {
     }
     for (i = 0; i < m_nFields; i++)
     {

-               fieldWidth = tempwidth[i];
-               fieldPosition = temppos;
+        fieldWidth = tempwidth[i];
+        fieldPosition = temppos;

 
 

-       temppos += tempwidth[i];
+          temppos += tempwidth[i];

 
 

-               if ( i == n )
-                       break;
+        if ( i == n )
+            break;

     }
     delete [] tempwidth;
   }
 
     rect.x = fieldPosition + wxTHICK_LINE_BORDER;
     }
     delete [] tempwidth;
   }
 
     rect.x = fieldPosition + wxTHICK_LINE_BORDER;

-       rect.y = wxTHICK_LINE_BORDER;
+    rect.y = wxTHICK_LINE_BORDER;

 
 

-       rect.width = fieldWidth - 2 * wxTHICK_LINE_BORDER ;
-       rect.height = height - 2 * wxTHICK_LINE_BORDER ;
+    rect.width = fieldWidth - 2 * wxTHICK_LINE_BORDER ;
+    rect.height = height - 2 * wxTHICK_LINE_BORDER ;

 
 

-       return TRUE;
+    return TRUE;

 }
 
 // Initialize colours
 }
 
 // Initialize colours

-void wxStatusBar::InitColours(void)
+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(wxColour(127, 127, 127), 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.

-void wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)

 {
     InitColours();
     Refresh();
 {
     InitColours();
     Refresh();


@@ -330,3 +386,20 @@ void wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
     wxWindow::OnSysColourChanged(event);
 }
 

+void wxStatusBarGeneric::SetMinHeight(int height)
+{
+    // check that this min height is not less than minimal height for the
+    // current font
+    wxClientDC dc(this);
+    wxCoord y;
+    dc.GetTextExtent( _T("X"), NULL, &y );
+
+    if ( height > (11*y)/10 )
+    {
+        SetSize(-1, -1, -1, height + 2*m_borderY);
+    }
+}
+
+#endif // wxUSE_STATUSBAR
+
+// vi:sts=4:sw=4:et