src/video/windx5/SDL_dx5video.c
branchSDL-1.3
changeset 1705 fc731a7d83ed
parent 1668 4da1ee79c9af
     1.1 --- a/src/video/windx5/SDL_dx5video.c	Sat Jun 24 03:43:21 2006 +0000
     1.2 +++ b/src/video/windx5/SDL_dx5video.c	Sat Jun 24 04:31:42 2006 +0000
     1.3 @@ -1225,9 +1225,8 @@
     1.4              bounds.top = SDL_windowY;
     1.5              bounds.right = SDL_windowX + video->w;
     1.6              bounds.bottom = SDL_windowY + video->h;
     1.7 -            AdjustWindowRectEx(&bounds,
     1.8 -                               GetWindowLong(SDL_Window, GWL_STYLE),
     1.9 -                               FALSE, 0);
    1.10 +            AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
    1.11 +                               (GetMenu(SDL_Window) != NULL), 0);
    1.12              width = bounds.right - bounds.left;
    1.13              height = bounds.bottom - bounds.top;
    1.14              if ((flags & SDL_FULLSCREEN)) {
    1.15 @@ -1315,10 +1314,10 @@
    1.16          bounds.right = GetSystemMetrics(SM_CXSCREEN);
    1.17          bounds.bottom = GetSystemMetrics(SM_CYSCREEN);
    1.18          AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
    1.19 -                           FALSE, 0);
    1.20 +                           (GetMenu(SDL_Window) != NULL), 0);
    1.21          SetWindowPos(SDL_Window, HWND_TOPMOST, bounds.left, bounds.top,
    1.22 -                     bounds.right - bounds.left,
    1.23 -                     bounds.bottom - bounds.top, SWP_NOCOPYBITS);
    1.24 +                     bounds.right - bounds.left, bounds.bottom - bounds.top,
    1.25 +                     SWP_NOCOPYBITS);
    1.26          ShowWindow(SDL_Window, SW_SHOW);
    1.27          while (GetForegroundWindow() != SDL_Window) {
    1.28              SetForegroundWindow(SDL_Window);
    1.29 @@ -1635,9 +1634,8 @@
    1.30              bounds.top = SDL_windowY;
    1.31              bounds.right = SDL_windowX + video->w;
    1.32              bounds.bottom = SDL_windowY + video->h;
    1.33 -            AdjustWindowRectEx(&bounds,
    1.34 -                               GetWindowLong(SDL_Window, GWL_STYLE),
    1.35 -                               FALSE, 0);
    1.36 +            AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE),
    1.37 +                               (GetMenu(SDL_Window) != NULL), 0);
    1.38              width = bounds.right - bounds.left;
    1.39              height = bounds.bottom - bounds.top;
    1.40              if (center) {