From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 24 Sep 2009 00:22:04 +0000 (+0000)
Subject: Handle deprecated background styles correctly in wxMSW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b469c9d81b0702ecfe6a4594c2e6d8d31b370fd0

Handle deprecated background styles correctly in wxMSW.

Handle wxBG_STYLE_TRANSPARENT as wxBG_STYLE_PAINT and wxBG_STYLE_COLOUR as
wxBG_STYLE_ERASE instead of asserting (and almost surely crashing next, as
this assert is in the code called when the window is repainted and so will be
called again when the assert dialog is shown resulting in reentrant assert).

Closes #11208.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index b518542e20..4316f77e8b 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4760,6 +4760,7 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
     switch ( GetBackgroundStyle() )
     {
         case wxBG_STYLE_ERASE:
+        case wxBG_STYLE_COLOUR:
             // we need to generate an erase background event
             {
                 wxDCTemp dc(hdc, GetClientSize());
@@ -4794,6 +4795,7 @@ bool wxWindowMSW::HandleEraseBkgnd(WXHDC hdc)
             break;
 
         case wxBG_STYLE_PAINT:
+        case wxBG_STYLE_TRANSPARENT:
             // no need to do anything here at all, background will be entirely
             // redrawn in WM_PAINT handler
             break;