src/video/windows/SDL_windowswindow.c
changeset 5382 fd9a7a0afcbf
parent 5305 75f5ff92ad08
child 5398 83816c8a2b58
--- a/src/video/windows/SDL_windowswindow.c	Mon Feb 21 22:26:59 2011 -0800
+++ b/src/video/windows/SDL_windowswindow.c	Mon Feb 21 22:27:19 2011 -0800
@@ -194,7 +194,6 @@
     SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
     HWND hwnd;
     RECT rect;
-    SDL_Rect bounds;
     DWORD style = STYLE_BASIC;
     int x, y;
     int w, h;
@@ -202,38 +201,16 @@
     style |= GetWindowStyle(window);
 
     /* Figure out what the window area will be */
-    rect.left = 0;
-    rect.top = 0;
-    rect.right = window->w;
-    rect.bottom = window->h;
+    rect.left = window->x;
+    rect.top = window->y;
+    rect.right = window->x + window->w;
+    rect.bottom = window->y + window->h;
     AdjustWindowRectEx(&rect, style, FALSE, 0);
+    x = rect.left;
+    y = rect.top;
     w = (rect.right - rect.left);
     h = (rect.bottom - rect.top);
 
-    WIN_GetDisplayBounds(_this, display, &bounds);
-    if (SDL_WINDOWPOS_ISCENTERED(window->x)) {
-        x = bounds.x + (bounds.w - w) / 2;
-    } else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) {
-        if (bounds.x == 0) {
-            x = CW_USEDEFAULT;
-        } else {
-            x = bounds.x;
-        }
-    } else {
-        x = window->x + rect.left;
-    }
-    if (SDL_WINDOWPOS_ISCENTERED(window->y)) {
-        y = bounds.y + (bounds.h - h) / 2;
-    } else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) {
-        if (bounds.x == 0) {
-            y = CW_USEDEFAULT;
-        } else {
-            y = bounds.y;
-        }
-    } else {
-        y = window->y + rect.top;
-    }
-
     hwnd =
         CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL,
                      SDL_Instance, NULL);