Fix SetBackgroundColour() for wxSplitterWindow.
Background colour was ignored even if wxSP_3DSASH was not included in the window flags. The OSX renderer already used the background colour.
This commit is contained in:
@@ -576,11 +576,11 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
|
|||||||
}
|
}
|
||||||
|
|
||||||
dc.SetPen(*wxTRANSPARENT_PEN);
|
dc.SetPen(*wxTRANSPARENT_PEN);
|
||||||
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
|
|
||||||
|
|
||||||
if ( win->HasFlag(wxSP_3DSASH) )
|
if ( win->HasFlag(wxSP_3DSASH) )
|
||||||
{
|
{
|
||||||
// Draw the 3D sash
|
// Draw the 3D sash
|
||||||
|
dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
|
||||||
dc.DrawRectangle(position + 2, 0, 3, h);
|
dc.DrawRectangle(position + 2, 0, 3, h);
|
||||||
|
|
||||||
dc.SetPen(m_penLightGrey);
|
dc.SetPen(m_penLightGrey);
|
||||||
@@ -598,6 +598,7 @@ wxRendererGeneric::DrawSplitterSash(wxWindow *win,
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Draw a flat sash
|
// Draw a flat sash
|
||||||
|
dc.SetBrush(wxBrush(win->GetBackgroundColour()));
|
||||||
dc.DrawRectangle(position, 0, 3, h);
|
dc.DrawRectangle(position, 0, 3, h);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user