comparison src/video/windib/SDL_dibvideo.c @ 1472:4aac8563c296

Fixed more Win64 portability issues
author Sam Lantinga <slouken@libsdl.org>
date Mon, 06 Mar 2006 08:11:10 +0000
parents 8dfa9a6d69a5
children 0a2bd6507477
comparison
equal deleted inserted replaced
1471:9fb0eee04dd9 1472:4aac8563c296
645 /* RJR: March 28, 2000 645 /* RJR: March 28, 2000
646 create identity palette switching to a palettized mode */ 646 create identity palette switching to a palettized mode */
647 screen_pal = DIB_CreatePalette(bpp); 647 screen_pal = DIB_CreatePalette(bpp);
648 } 648 }
649 649
650 style = GetWindowLong(SDL_Window, GWL_STYLE); 650 style = GetWindowLongPtr(SDL_Window, GWL_STYLE);
651 style &= ~(resizestyle|WS_MAXIMIZE); 651 style &= ~(resizestyle|WS_MAXIMIZE);
652 if ( (video->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN ) { 652 if ( (video->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN ) {
653 style &= ~windowstyle; 653 style &= ~windowstyle;
654 style |= directstyle; 654 style |= directstyle;
655 } else { 655 } else {
675 #endif 675 #endif
676 } 676 }
677 677
678 /* DJM: Don't piss of anyone who has setup his own window */ 678 /* DJM: Don't piss of anyone who has setup his own window */
679 if ( !SDL_windowid ) 679 if ( !SDL_windowid )
680 SetWindowLong(SDL_Window, GWL_STYLE, style); 680 SetWindowLongPtr(SDL_Window, GWL_STYLE, style);
681 681
682 /* Delete the old bitmap if necessary */ 682 /* Delete the old bitmap if necessary */
683 if ( screen_bmp != NULL ) { 683 if ( screen_bmp != NULL ) {
684 DeleteObject(screen_bmp); 684 DeleteObject(screen_bmp);
685 } 685 }
778 778
779 bounds.left = SDL_windowX; 779 bounds.left = SDL_windowX;
780 bounds.top = SDL_windowY; 780 bounds.top = SDL_windowY;
781 bounds.right = SDL_windowX+video->w; 781 bounds.right = SDL_windowX+video->w;
782 bounds.bottom = SDL_windowY+video->h; 782 bounds.bottom = SDL_windowY+video->h;
783 AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); 783 AdjustWindowRectEx(&bounds, GetWindowLongPtr(SDL_Window, GWL_STYLE), FALSE, 0);
784 width = bounds.right-bounds.left; 784 width = bounds.right-bounds.left;
785 height = bounds.bottom-bounds.top; 785 height = bounds.bottom-bounds.top;
786 if ( (flags & SDL_FULLSCREEN) ) { 786 if ( (flags & SDL_FULLSCREEN) ) {
787 x = (GetSystemMetrics(SM_CXSCREEN)-width)/2; 787 x = (GetSystemMetrics(SM_CXSCREEN)-width)/2;
788 y = (GetSystemMetrics(SM_CYSCREEN)-height)/2; 788 y = (GetSystemMetrics(SM_CYSCREEN)-height)/2;