No changes, just remove unnecessary wxPickerBase::OnSize().

[wxWidgets.git] / src / msw / panel.cpp

diff --git a/src/msw/panel.cpp b/src/msw/panel.cpp
index 5dc1bfcf5a2027b540beec3ceb26200768c4818d..c502caf9f5655145b01dddde65365ce11ed00b91 100644 (file)
--- a/src/msw/panel.cpp
+++ b/src/msw/panel.cpp
@@ -33,6 +33,11 @@
 // implementation
 // ============================================================================
 
+wxPanel::~wxPanel()
+{
+    delete m_backgroundBrush;
+}
+
 bool wxPanel::HasTransparentBackground()
 {
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
@@ -51,6 +56,11 @@ void wxPanel::DoSetBackgroundBitmap(const wxBitmap& bmp)
 {
     delete m_backgroundBrush;
     m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL;
+
+    // Our transparent children should use our background if we have it,
+    // otherwise try to restore m_inheritBgCol to some reasonable value: true
+    // if we also have non-default background colour or false otherwise.
+    m_inheritBgCol = bmp.IsOk() || UseBgCol();
 }
 
 WXHBRUSH wxPanel::MSWGetCustomBgBrush()