some win64 fixes from Willis

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 9f86830566634d44d0f5cb832a1ea5cb6c7682f0..6f59ad305cadc81915fb604ba7f2b8db0431f09f 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -346,11 +346,13 @@ static void VID_SetCaption()
                return;
 
        icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
-#ifndef WIN64
-       SetClassLong( info.window, GCL_HICON, (LONG) icon );
-#else
-       SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
+#ifndef SetClassLongPtr
+#define SetClassLongPtr SetClassLong
+#endif
+#ifndef GCLP_HICON
+#define GCLP_HICON GCL_HICON
 #endif
+       SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
 #else
 static void VID_SetCaption()
@@ -493,7 +495,9 @@ void VID_Finish (void)
        //react on appstate changes
        appstate = SDL_GetAppState();
 
-       if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
+       vid_hidden = !(appstate & SDL_APPACTIVE);
+
+       if( vid_hidden || !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
                vid_activewindow = false;
        else
                vid_activewindow = true;