From 8082a771dbd07ba4a1868ca22bb5e6c62c2a653a Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 29 Jan 2001 19:56:37 +0000
Subject: [PATCH] another fix for MDI styles

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/mdi.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 8ce7cfc8e9..502ad620de 100644
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1089,10 +1089,14 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
     if (!pChild || (pChild == this))
     {
         HWND hwndClient = GetWinHwnd(pFrameWnd->GetClientWindow());
-        DWORD dwStyle = ::GetWindowLong(hwndClient, GWL_STYLE);
-        DWORD dwThisStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+        DWORD dwStyle = ::GetWindowLong(hwndClient, GWL_EXSTYLE);
+
+        // we want to test whether there is a maximized child, so just set
+        // dwThisStyle to 0 if there is no child at all
+        DWORD dwThisStyle = pChild
+            ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : NULL;
         DWORD dwNewStyle = dwStyle;
-        if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE))
+        if ( dwThisStyle & WS_MAXIMIZE )
             dwNewStyle &= ~(WS_EX_CLIENTEDGE);
         else
             dwNewStyle |= WS_EX_CLIENTEDGE;
-- 
2.47.2