diff --git a/docs/changes.txt b/docs/changes.txt index bfd797a653..8d5208f407 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -117,6 +117,7 @@ wxGTK: wxUniv: - Fix wxTextCtrl::SetSelection(-1, -1) to behave as documented (Anders Larsen) +- Fix setting background colour for controls with transparent background 2.8.3 diff --git a/src/univ/stattext.cpp b/src/univ/stattext.cpp index 83ebf31eaf..509a5d6dde 100644 --- a/src/univ/stattext.cpp +++ b/src/univ/stattext.cpp @@ -88,14 +88,6 @@ wxSize wxStaticText::DoGetBestClientSize() const void wxStaticText::DoDraw(wxControlRenderer *renderer) { - if ( UseBgCol() ) - { - wxDC& dc = renderer->GetDC(); - dc.SetBrush(GetBackgroundColour()); - dc.SetPen(*wxTRANSPARENT_PEN); - dc.DrawRectangle(renderer->GetRect()); - } - renderer->DrawLabel(); } diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index fcdda770e1..bfb8106230 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -336,7 +336,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc) rect.height = size.y; wxWindow * const parent = GetParent(); - if ( HasTransparentBackground() && parent ) + if ( HasTransparentBackground() && !UseBgCol() && parent ) { wxASSERT( !IsTopLevel() );