Corrceted background problem with themes.

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index d2f31f0096ffa8fe5be74999d0e5b362ad5d3884..73919d52ac5fba383952cea4d11f667989a59e23 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

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

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


@@ -29,23 +29,17 @@
 
 #include "wx/generic/statusbr.h"
 
 
 #include "wx/generic/statusbr.h"
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include <windows.h>
 #include <windows.h>

-
-#ifdef DrawText
-#undef DrawText
-#endif
-
+#include "wx/msw/winundef.h"

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
 
 BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
 
 BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)

-       EVT_PAINT(wxStatusBar::OnPaint)
+    EVT_PAINT(wxStatusBar::OnPaint)

     EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
 END_EVENT_TABLE()
     EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
 END_EVENT_TABLE()

-#endif

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


@@ -53,8 +47,8 @@ END_EVENT_TABLE()
 
 wxStatusBar::wxStatusBar(void)
 {
 
 wxStatusBar::wxStatusBar(void)
 {

-  m_statusWidths = NULL;
-  m_statusStrings = NULL;
+  m_statusWidths = (int *) NULL;
+  m_statusStrings = (wxString *) NULL;

   m_nFields = 0;
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
   m_nFields = 0;
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;


@@ -62,31 +56,34 @@ wxStatusBar::wxStatusBar(void)
 
 wxStatusBar::~wxStatusBar(void)
 {
 
 wxStatusBar::~wxStatusBar(void)
 {

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

 }
 
 }
 

-bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,

            const wxPoint& pos,
            const wxSize& size,
            const wxPoint& pos,
            const wxSize& size,

-           const long style,
+           long style,

            const wxString& name)
 {
            const wxString& name)
 {

-  m_statusWidths = NULL;
-  m_statusStrings = NULL;
+  m_statusWidths = (int *) NULL;
+  m_statusStrings = (wxString *) NULL;

   m_nFields = 0;
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 
   m_nFields = 0;
   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, pos, size, style | wxTAB_TRAVERSAL, name);

 
   // Don't wish this to be found as a child
 
   // Don't wish this to be found as a child

-  parent->GetChildren()->DeleteObject(this);
-
+#ifndef __WXMAC__
+  parent->GetChildren().DeleteObject(this);
+#endif

   InitColours();
 
   SetFont(m_defaultStatusBarFont);
   InitColours();
 
   SetFont(m_defaultStatusBarFont);


@@ -94,27 +91,27 @@ bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
   return success;
 }
 
   return success;
 }
 

-void wxStatusBar::SetFieldsCount(const int number, const int *widths)
+void wxStatusBar::SetFieldsCount(int number, const int widths[])

 {
   m_nFields = number;
 
   if ( m_statusWidths )
 {
   m_nFields = number;
 
   if ( m_statusWidths )

-       delete[] m_statusWidths;
+    delete[] m_statusWidths;

 
   if ( m_statusStrings )
 
   if ( m_statusStrings )

-               delete[] m_statusStrings;
+        delete[] m_statusStrings;

 
   m_statusStrings = new wxString[number];
 
   int i;
   for (i = 0; i < number; i++)
 
   m_statusStrings = new wxString[number];
 
   int i;
   for (i = 0; i < number; i++)

-       m_statusStrings[i] = "";
+    m_statusStrings[i] = "";

 
 

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

 }
 
 }
 

-void wxStatusBar::SetStatusText(const wxString& text, const int number)
+void wxStatusBar::SetStatusText(const wxString& text, int number)

 {
   if ((number < 0) || (number >= m_nFields))
     return;
 {
   if ((number < 0) || (number >= m_nFields))
     return;


@@ -123,14 +120,14 @@ void wxStatusBar::SetStatusText(const wxString& text, const int number)
 
   Refresh();
 
 
   Refresh();
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

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

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

 {
   if ((n < 0) || (n >= m_nFields))
     return wxString("");
 {
   if ((n < 0) || (n >= m_nFields))
     return wxString("");


@@ -138,7 +135,7 @@ wxString wxStatusBar::GetStatusText(const int n) const
     return m_statusStrings[n];
 }
 
     return m_statusStrings[n];
 }
 

-void wxStatusBar::SetStatusWidths(const int n, const int *widths_field)
+void wxStatusBar::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 n == number of statuswindows
   if (n == m_nFields)


@@ -170,19 +167,23 @@ void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) )
   wxPaintDC dc(this);
 
   int i;
   wxPaintDC dc(this);
 
   int i;

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

   dc.SetBackgroundMode(wxTRANSPARENT);
 
   for ( i = 0; i < m_nFields; i ++ )
   dc.SetBackgroundMode(wxTRANSPARENT);
 
   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 wxStatusBar::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));


@@ -193,6 +194,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.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
 


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

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

 {
 {

-  wxRectangle rect;
+  wxRect rect;

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


@@ -212,27 +218,27 @@ 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);

 
     // 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);

 
 

-       DrawFieldText(dc, i);
+    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 wxStatusBar::GetFieldRect(int n, wxRect& rect) const

 {
   if ((n < 0) || (n >= m_nFields))
     return FALSE;
 {
   if ((n < 0) || (n >= m_nFields))
     return FALSE;


@@ -265,9 +271,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,24 +287,24 @@ 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


@@ -316,7 +322,7 @@ void wxStatusBar::InitColours(void)
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif
 
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif
 

-       m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+    m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);

     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }