use parent background and not ours unless one was explicitly set when manually drawing (related to #8684)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-16 01:30:32 +00:00
parent 56c74796a6
commit 52d80ec642

View File

@@ -256,8 +256,11 @@ void wxStaticBitmap::DoPaintManually(wxPaintEvent& WXUNUSED(event))
const wxSize size(GetSize()); const wxSize size(GetSize());
const wxBitmap bmp(GetBitmap()); const wxBitmap bmp(GetBitmap());
// Clear the background // Clear the background: notice that we're supposed to be transparent, so
dc.SetBrush(GetBackgroundColour()); // use the parent background colour if we don't have our own instead of
// falling back to the default
const wxWindow *win = UseBgCol() ? this : GetParent();
dc.SetBrush(win->GetBackgroundColour());
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(0, 0, size.GetWidth(), size.GetHeight()); dc.DrawRectangle(0, 0, size.GetWidth(), size.GetHeight());