From 8767b30f75db5732023d9ebf9d93573f3b839e50 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 15 Mar 2013 15:41:13 -0400 Subject: [PATCH] My OCD will not stand for this. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 10 +++++----- Source/Core/DolphinWX/Src/Main.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index e72b5db13d..e9c6dd2cd2 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -75,12 +75,12 @@ Core::GetWindowHandle(). #include // wxWidgets #ifdef _WIN32 -#ifndef SM_YVIRTUALSCREEN -#define SM_YVIRTUALSCREEN 77 -#endif #ifndef SM_XVIRTUALSCREEN #define SM_XVIRTUALSCREEN 76 #endif +#ifndef SM_YVIRTUALSCREEN +#define SM_YVIRTUALSCREEN 77 +#endif #ifndef SM_CXVIRTUALSCREEN #define SM_CXVIRTUALSCREEN 78 #endif @@ -879,10 +879,10 @@ void CFrame::StartGame(const std::string& filename) SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); #ifdef _WIN32 // Out of desktop check - int height = GetSystemMetrics(SM_CYVIRTUALSCREEN); - int width = GetSystemMetrics(SM_CXVIRTUALSCREEN); int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN); int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN); + int width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + int height = GetSystemMetrics(SM_CYVIRTUALSCREEN); if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y) position.x = position.y = wxDefaultCoord; #endif diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 20dbfa80cf..230c93c04e 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -49,12 +49,12 @@ #ifdef _WIN32 #include -#ifndef SM_YVIRTUALSCREEN -#define SM_YVIRTUALSCREEN 77 -#endif #ifndef SM_XVIRTUALSCREEN #define SM_XVIRTUALSCREEN 76 #endif +#ifndef SM_YVIRTUALSCREEN +#define SM_YVIRTUALSCREEN 77 +#endif #ifndef SM_CXVIRTUALSCREEN #define SM_CXVIRTUALSCREEN 78 #endif @@ -308,10 +308,10 @@ bool DolphinApp::OnInit() // do not allow windows to be created off the desktop. #ifdef _WIN32 // Out of desktop check - int height = GetSystemMetrics(SM_CYVIRTUALSCREEN); - int width = GetSystemMetrics(SM_CXVIRTUALSCREEN); int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN); int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN); + int width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + int height = GetSystemMetrics(SM_CYVIRTUALSCREEN); if ((leftPos + width) < (x + w) || leftPos > x || (topPos + height) < (y + h) || topPos > y) x = y = wxDefaultCoord; #elif defined __APPLE__