From 657a296b32ad2512f261b83217fe87e4f43a64a8 Mon Sep 17 00:00:00 2001 From: stephena Date: Wed, 11 Aug 2010 22:44:03 +0000 Subject: [PATCH] Line feed changes. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2093 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- src/win32/OSystemWin32.cxx | 44 +++++++++++++++++++------------------- src/win32/OSystemWin32.hxx | 12 +++++------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/win32/OSystemWin32.cxx b/src/win32/OSystemWin32.cxx index 4a7a97148..08402fad1 100644 --- a/src/win32/OSystemWin32.cxx +++ b/src/win32/OSystemWin32.cxx @@ -17,7 +17,7 @@ // $Id$ //============================================================================ -#include +#include #include #include "bspf.hxx" @@ -91,24 +91,24 @@ OSystemWin32::~OSystemWin32() } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -void OSystemWin32::setAppWindowPos(int x, int y, int w, int h) -{ - SDL_SysWMinfo sdl_info; - memset(&sdl_info, 0, sizeof(sdl_info)); - SDL_VERSION (&sdl_info.version); - if(SDL_GetWMInfo(&sdl_info) <= 0) - return; - - // The following mostly comes from SDL_dx5video.c - HWND window = sdl_info.window; - RECT bounds; - - bounds.left = x; - bounds.top = y; - bounds.right = x + w; - bounds.bottom = y + h; - AdjustWindowRectEx(&bounds, GetWindowLong(window, GWL_STYLE), (GetMenu(window) != NULL), 0); - - SetWindowPos(window, HWND_NOTOPMOST, x, y, bounds.right-bounds.left, - bounds.bottom-bounds.top, SWP_NOCOPYBITS | SWP_SHOWWINDOW); -} +void OSystemWin32::setAppWindowPos(int x, int y, int w, int h) +{ + SDL_SysWMinfo sdl_info; + memset(&sdl_info, 0, sizeof(sdl_info)); + SDL_VERSION (&sdl_info.version); + if(SDL_GetWMInfo(&sdl_info) <= 0) + return; + + // The following mostly comes from SDL_dx5video.c + HWND window = sdl_info.window; + RECT bounds; + + bounds.left = x; + bounds.top = y; + bounds.right = x + w; + bounds.bottom = y + h; + AdjustWindowRectEx(&bounds, GetWindowLong(window, GWL_STYLE), (GetMenu(window) != NULL), 0); + + SetWindowPos(window, HWND_NOTOPMOST, x, y, bounds.right-bounds.left, + bounds.bottom-bounds.top, SWP_NOCOPYBITS | SWP_SHOWWINDOW); +} diff --git a/src/win32/OSystemWin32.hxx b/src/win32/OSystemWin32.hxx index 11bbece97..a2ddf0574 100644 --- a/src/win32/OSystemWin32.hxx +++ b/src/win32/OSystemWin32.hxx @@ -43,12 +43,12 @@ class OSystemWin32 : public OSystem virtual ~OSystemWin32(); public: - /** - Move window to given position. The width and height are also - required for the underlying function, but the window size itself - absolutely must not be changed. - */ - void setAppWindowPos(int x, int y, int w, int h); + /** + Move window to given position. The width and height are also + required for the underlying function, but the window size itself + absolutely must not be changed. + */ + void setAppWindowPos(int x, int y, int w, int h); }; #endif