diff options
author | Jürgen Herrmann <shadowrom@me.com> | 2013-05-14 00:27:05 +0400 |
---|---|---|
committer | Jürgen Herrmann <shadowrom@me.com> | 2013-05-14 00:27:05 +0400 |
commit | 3d3a4e8eec2a1549fd8b0ec32e6ddd73af5938d5 (patch) | |
tree | f392e410dae7c51c13cecbccecd918f17439e8db /source/gameengine/GamePlayer | |
parent | 92da9792fe7f3d2b67f59133c584786aa72777ae (diff) |
Patch [#35234]:
Fix GetWindowsLon and SetWindowsLong issues with VS2012 and Windows 8.
Remove unneeded #ifdef block for GWL_WNDPROC and GWL_USERDATA
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 31ce1869544..3cba65779d1 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -260,14 +260,14 @@ bool GPG_Application::startScreenSaverPreview( } SetParent(ghost_hwnd, parentWindow); - LONG style = GetWindowLong(ghost_hwnd, GWL_STYLE); - LONG exstyle = GetWindowLong(ghost_hwnd, GWL_EXSTYLE); + LONG_PTR style = GetWindowLongPtr(ghost_hwnd, GWL_STYLE); + LONG_PTR exstyle = GetWindowLongPtr(ghost_hwnd, GWL_EXSTYLE); RECT adjrc = { 0, 0, windowWidth, windowHeight }; AdjustWindowRectEx(&adjrc, style, FALSE, exstyle); style = (style & (~(WS_POPUP|WS_OVERLAPPEDWINDOW|WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME|WS_MINIMIZEBOX|WS_MAXIMIZEBOX|WS_TILEDWINDOW ))) | WS_CHILD; - SetWindowLong(ghost_hwnd, GWL_STYLE, style); + SetWindowLongPtr(ghost_hwnd, GWL_STYLE, style); SetWindowPos(ghost_hwnd, NULL, adjrc.left, adjrc.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE|SWP_NOACTIVATE); /* Check the size of the client rectangle of the window and resize the window |