# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1151123502 0
# Node ID fc731a7d83ed7704a174d7548d00dfbf16ebc086
# Parent  03fb364e32836720e22c79e12eddb7b7ddf281cc
Merged fix for bug #258 from SDL 1.2

diff -r 03fb364e3283 -r fc731a7d83ed src/video/windib/SDL_dibvideo.c
--- a/src/video/windib/SDL_dibvideo.c	Sat Jun 24 03:43:21 2006 +0000
+++ b/src/video/windib/SDL_dibvideo.c	Sat Jun 24 04:31:42 2006 +0000
@@ -805,7 +805,7 @@
         bounds.right = SDL_windowX + video->w;
         bounds.bottom = SDL_windowY + video->h;
         AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
-                           FALSE, 0);
+                           (GetMenu(SDL_Window) != NULL), 0);
         width = bounds.right - bounds.left;
         height = bounds.bottom - bounds.top;
         if ((flags & SDL_FULLSCREEN)) {
diff -r 03fb364e3283 -r fc731a7d83ed src/video/windx5/SDL_dx5video.c
--- a/src/video/windx5/SDL_dx5video.c	Sat Jun 24 03:43:21 2006 +0000
+++ b/src/video/windx5/SDL_dx5video.c	Sat Jun 24 04:31:42 2006 +0000
@@ -1225,9 +1225,8 @@
             bounds.top = SDL_windowY;
             bounds.right = SDL_windowX + video->w;
             bounds.bottom = SDL_windowY + video->h;
-            AdjustWindowRectEx(&bounds,
-                               GetWindowLong(SDL_Window, GWL_STYLE),
-                               FALSE, 0);
+            AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
+                               (GetMenu(SDL_Window) != NULL), 0);
             width = bounds.right - bounds.left;
             height = bounds.bottom - bounds.top;
             if ((flags & SDL_FULLSCREEN)) {
@@ -1315,10 +1314,10 @@
         bounds.right = GetSystemMetrics(SM_CXSCREEN);
         bounds.bottom = GetSystemMetrics(SM_CYSCREEN);
         AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
-                           FALSE, 0);
+                           (GetMenu(SDL_Window) != NULL), 0);
         SetWindowPos(SDL_Window, HWND_TOPMOST, bounds.left, bounds.top,
-                     bounds.right - bounds.left,
-                     bounds.bottom - bounds.top, SWP_NOCOPYBITS);
+                     bounds.right - bounds.left, bounds.bottom - bounds.top,
+                     SWP_NOCOPYBITS);
         ShowWindow(SDL_Window, SW_SHOW);
         while (GetForegroundWindow() != SDL_Window) {
             SetForegroundWindow(SDL_Window);
@@ -1635,9 +1634,8 @@
             bounds.top = SDL_windowY;
             bounds.right = SDL_windowX + video->w;
             bounds.bottom = SDL_windowY + video->h;
-            AdjustWindowRectEx(&bounds,
-                               GetWindowLong(SDL_Window, GWL_STYLE),
-                               FALSE, 0);
+            AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
+                               (GetMenu(SDL_Window) != NULL), 0);
             width = bounds.right - bounds.left;
             height = bounds.bottom - bounds.top;
             if (center) {