X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28be2e8a170979d476a5ea4f585505b8a2f5af27..dda88f5eee7ae13a328f92996847f90caed2e5e9:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index dbd35b40f8..386ba1d251 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -182,7 +182,10 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) dc.SetBackgroundMode(wxTRANSPARENT); #ifdef __WXPM__ - ::WinFillRect(vDC.m_hPS, &vDC.m_rclPaint, CLR_GREEN); + wxColour vColor; + + vColor.InitFromName("GREY"); + ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel()); #endif for ( i = 0; i < m_nFields; i ++ ) @@ -244,6 +247,8 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) 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); @@ -257,6 +262,25 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) 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); } @@ -345,6 +369,9 @@ void wxStatusBarGeneric::InitColours() 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);