even controls with transparent background should draw it if they have an explicitly...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index e19965a1341d60c632de0b3f755655f87c1ceee3..0b86119d641f4659ded7a8bb302183c059707261 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -160,6 +160,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 ea5d42a206ad653621f6d7a39d16a3487e858be9..f854398a17b68da74a6eaa4edbbd06b50382b9e7 100644 (file)
--- a/src/univ/stattext.cpp
+++ b/src/univ/stattext.cpp
@@ -83,14 +83,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 6a03329594c297fbc4457a3188b9af76b537e134..90bb87c58f2780dc5dc4e3c3cae36d0d88fa8053 100644 (file)
--- a/src/univ/winuniv.cpp
+++ b/src/univ/winuniv.cpp
@@ -359,7 +359,7 @@ bool wxWindow::DoDrawBackground(wxDC& dc)
     rect.height = size.y;
 
     wxWindow * const parent = GetParent();
-    if ( HasTransparentBackground() && parent )
+    if ( HasTransparentBackground() && !UseBgCol() && parent )
     {
         wxASSERT( !IsTopLevel() );