From fcc7e7595b1db1d9bd9af239d7ef614db8aac618 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 13 Dec 2007 20:49:34 +0000
Subject: [PATCH] Ensure child is frozen before trying to thaw it, to avoid
 assert.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/window.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index aac4b16de1..17b750e8bb 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1562,7 +1562,12 @@ void wxWindowMSW::Thaw()
                     if ( child->IsTopLevel() )
                         continue;
                     else
-                        child->Thaw();
+                    {
+                        // in case the child was added while the TLW was
+                        // frozen, it won't be frozen now so avoid the Thaw.
+                        if ( child->IsFrozen() )
+                            child->Thaw();
+                    }
                 }
             }
             else // This is not a TLW, so just thaw it.