Use Get/SetWindowLongPtr

[libs/gui.git] / source / graphics / windows / window.cpp

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 3f564dec68ef5a28221bd8c20691f0e37370f7f8..977efcdd5ea33fe147db8c82cf59fbb7208e6eec 100644 (file)
--- a/source/graphics/windows/window.cpp
+++ b/source/graphics/windows/window.cpp
@@ -14,11 +14,11 @@ LRESULT CALLBACK wndproc_(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
        if(msg==WM_CREATE)
        {
                CREATESTRUCT *cs = reinterpret_cast<CREATESTRUCT *>(lparam);
-               SetWindowLong(hwnd, 0, reinterpret_cast<LONG>(cs->lpCreateParams));
+               SetWindowLongPtr(hwnd, 0, reinterpret_cast<LONG_PTR>(cs->lpCreateParams));
        }
        else
        {
-               Msp::Graphics::Window *wnd = reinterpret_cast<Msp::Graphics::Window *>(GetWindowLong(hwnd, 0));
+               Msp::Graphics::Window *wnd = reinterpret_cast<Msp::Graphics::Window *>(GetWindowLongPtr(hwnd, 0));
                Msp::Graphics::Window::Event ev;
                ev.msg = msg;
                ev.wparam = wparam;
@@ -114,10 +114,13 @@ void Window::platform_reconfigure(bool fullscreen_changed)
 
        if(fullscreen_changed)
        {
-               hide();
-               SetWindowLong(priv->window, GWL_EXSTYLE, exstyle);
-               SetWindowLong(priv->window, GWL_STYLE, style);
-               show();
+               bool was_visible = visible;
+               if(was_visible)
+                       hide();
+               SetWindowLongPtr(priv->window, GWL_EXSTYLE, exstyle);
+               SetWindowLongPtr(priv->window, GWL_STYLE, style);
+               if(was_visible)
+                       show();
        }
 
        if(options.fullscreen)