Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't hardcode grey/white colours for non-MSW/Mac in InitColours(), use wxSystemSettings for all ports (even if some of them, such as wxGTK, still hardcode white for wxSYS_COLOUR_3DHILIGHT) (replaces patch 1883386)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@51615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-09 15:10:13 +00:00
parent 326ed6e95e
commit be0d2b4b11
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/generic/statusbr.cpp
View File

@@ -81,14 +81,14 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
SetFont(*wxSMALL_FONT); SetFont(*wxSMALL_FONT);
#endif #endif
wxCoord y; wxCoord y;
{ {
// Set the height according to the font and the border size // Set the height according to the font and the border size
wxClientDC dc(this); wxClientDC dc(this);
dc.SetFont(GetFont()); dc.SetFont(GetFont());
dc.GetTextExtent(_T("X"), NULL, &y ); dc.GetTextExtent(_T("X"), NULL, &y );
} }
int height = (int)( (11*y)/10 + 2*GetBorderY()); int height = (int)( (11*y)/10 + 2*GetBorderY());
SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height); SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
@@ -200,7 +200,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
{ {
int width, height; int width, height;
GetClientSize(&width, &height); GetClientSize(&width, &height);
if (GetLayoutDirection() == wxLayout_RightToLeft) if (GetLayoutDirection() == wxLayout_RightToLeft)
{ {
gtk_paint_resize_grip( m_widget->style, gtk_paint_resize_grip( m_widget->style,
@@ -368,23 +368,16 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
// Initialize colours // Initialize colours
void wxStatusBarGeneric::InitColours() void wxStatusBarGeneric::InitColours()
{ {
// Shadow colours #if defined(__WXPM__)
#if defined(__WXMSW__) || defined(__WXMAC__)
wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
#elif defined(__WXPM__)
m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID); m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
m_hilightPen = *wxWHITE_PEN; m_hilightPen = *wxWHITE_PEN;
SetBackgroundColour(*wxLIGHT_GREY); SetBackgroundColour(*wxLIGHT_GREY);
SetForegroundColour(*wxBLACK); SetForegroundColour(*wxBLACK);
#else #else // !__WXPM__
m_mediumShadowPen = *wxGREY_PEN; m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_hilightPen = *wxWHITE_PEN; m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
#endif #endif // __WXPM__/!__WXPM__
} }
// Responds to colour changes, and passes event on to children. // Responds to colour changes, and passes event on to children.