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 51603177f5cf537e097dc50f365a2ee2b9a1a9f9..24f273375d81058090674a4374210eb1c89ad402 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -112,12 +112,13 @@ void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 
     // if( number > m_nFields )
 
 
     // if( number > m_nFields )
 

-    for( int i = m_nFields; i < number; ++i )
+    int i;
+    for(i = m_nFields; i < number; ++i)

         m_statusStrings.Add( wxEmptyString );
 
     // if( number < m_nFields )
 
         m_statusStrings.Add( wxEmptyString );
 
     // if( number < m_nFields )
 

-    for (int i = m_nFields - 1; i >= number; --i)
+    for (i = m_nFields - 1; i >= number; --i)

         m_statusStrings.Remove(i);
 
     m_nFields = number;
         m_statusStrings.Remove(i);
 
     m_nFields = number;


@@ -137,7 +138,7 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
 
     wxRect rect;
     GetFieldRect(number, rect);
 
     wxRect rect;
     GetFieldRect(number, rect);

-    
+

     Refresh( TRUE, &rect );
 }
 
     Refresh( TRUE, &rect );
 }
 


@@ -183,7 +184,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 #ifdef __WXPM__
   wxColour                          vColor;
 
 #ifdef __WXPM__
   wxColour                          vColor;
 

-  vColor.InitFromName("LIGHT GREY");
+  vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);

   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 
   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 


@@ -252,22 +253,17 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
     dc.DrawLine(rect.x, rect.y,
         rect.x + rect.width, rect.y);
 #else
     dc.DrawLine(rect.x, rect.y,
         rect.x + rect.width, rect.y);
 #else

-    // Right
+
+    dc.DrawLine(rect.x + rect.width, rect.height + 2,
+                rect.x, rect.height + 2);

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

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

     dc.SetPen(m_mediumShadowPen);
     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);
+    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
 
 
 #endif
 


@@ -359,7 +355,7 @@ void wxStatusBarGeneric::InitColours()
     wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)
     wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)

-    m_mediumShadowPen = wxPen("DARK GREY", 1, wxSOLID);
+    m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);

     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 
     wxColour                        vColour;
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 
     wxColour                        vColour;