From b34590ebf846bbb14f6e09a100e4ad33242603ec Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 27 Nov 2000 04:14:45 +0000 Subject: [PATCH] Some OS/2 customization to make a more presentable statusbar. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/statusbr.cpp | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index d661b1be08..c42e213209 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(dc.m_hPS, &dc.m_vRclPaint, CLR_GREEN); + wxColour vColor; + + vColor.InitFromName("DIM 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 - 3, + rect.x + rect.width, rect.y + rect.height); + dc.SetPen(m_mediumShadowPen); + dc.DrawLine(rect.x + rect.width + 1, rect.y - 3, + rect.x + rect.width + 1, rect.y + rect.height); + dc.DrawLine(rect.x + rect.width + 2, rect.y - 3, + rect.x + rect.width + 2, rect.y + rect.height); + // Top + dc.DrawLine(rect.x + rect.width + 2, rect.y + rect.height + 2, + rect.x - 2, rect.y + rect.height + 2); + dc.DrawLine(rect.x + rect.width + 1, rect.y + rect.height + 1, + rect.x - 2, rect.y + rect.height + 1); + dc.SetPen(m_hilightPen); + dc.DrawLine(rect.x + rect.width, rect.y + rect.height, + rect.x - 2, rect.y + rect.height); + +#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); -- 2.45.2