X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fwindows%2Fwindow.cpp;h=38e7f730cd5bc6341aaeb00c30ae92fefa4d0374;hb=43d31e73c4b97a37017757232c4ef1db355fee3a;hp=3f564dec68ef5a28221bd8c20691f0e37370f7f8;hpb=504de8687a39943f94ff02b20acb647e9185b488;p=libs%2Fgui.git

diff --git a/source/graphics/windows/window.cpp b/source/graphics/windows/window.cpp
index 3f564de..38e7f73 100644
--- 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)
@@ -171,6 +174,9 @@ bool Window::event(const Event &evnt)
 	case WM_KEYDOWN:
 	case WM_KEYUP:
 	case WM_CHAR:
+	case WM_SYSKEYDOWN:
+	case WM_SYSKEYUP:
+	case WM_SYSCHAR:
 	case WM_LBUTTONDOWN:
 	case WM_LBUTTONUP:
 	case WM_MBUTTONDOWN: