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)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4732e2dca9
commit
ba959d4c98
@ -371,23 +371,16 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
|
||||
// Initialize colours
|
||||
void wxStatusBarGeneric::InitColours()
|
||||
{
|
||||
// Shadow colours
|
||||
#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__)
|
||||
#if defined(__WXPM__)
|
||||
m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
|
||||
m_hilightPen = *wxWHITE_PEN;
|
||||
|
||||
SetBackgroundColour(*wxLIGHT_GREY);
|
||||
SetForegroundColour(*wxBLACK);
|
||||
#else
|
||||
m_mediumShadowPen = *wxGREY_PEN;
|
||||
m_hilightPen = *wxWHITE_PEN;
|
||||
#endif
|
||||
#else // !__WXPM__
|
||||
m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
|
||||
m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
|
||||
#endif // __WXPM__/!__WXPM__
|
||||
}
|
||||
|
||||
// Responds to colour changes, and passes event on to children.
|
||||
|
Loading…
Reference in New Issue
Block a user