Implement undo and redo for the ie and gtk webkit backends. Extend the sample to...

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

diff --git a/src/msw/panel.cpp b/src/msw/panel.cpp
index bc73d1267a03e9265373820452b42d8f167aa286..e5b57eeb3af095b1115568f02064ac8a3f4b5025 100644 (file)
--- a/src/msw/panel.cpp
+++ b/src/msw/panel.cpp
@@ -24,6 +24,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/panel.h"
 #endif // WX_PRECOMP
@@ -50,6 +51,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()