*** empty log message *** release-1.2.5
authorSam Lantinga <slouken@libsdl.org>
Sun, 06 Oct 2002 20:31:34 +0000
changeset 515230b156829ed
parent 514 1080bfc4aa96
child 516 6636b20693a8
*** empty log message ***
src/video/windib/SDL_dibevents.c
src/video/windib/SDL_dibvideo.c
     1.1 --- a/src/video/windib/SDL_dibevents.c	Sun Oct 06 20:25:05 2002 +0000
     1.2 +++ b/src/video/windib/SDL_dibevents.c	Sun Oct 06 20:31:34 2002 +0000
     1.3 @@ -28,9 +28,6 @@
     1.4  #include <stdlib.h>
     1.5  #include <stdio.h>
     1.6  #include <windows.h>
     1.7 -#ifdef HAVE_AYGSHELL
     1.8 -#include <aygshell.h>
     1.9 -#endif
    1.10  
    1.11  #include "SDL_events.h"
    1.12  #include "SDL_error.h"
    1.13 @@ -366,12 +363,6 @@
    1.14  void DIB_DestroyWindow(_THIS)
    1.15  {
    1.16  	if ( SDL_windowid == NULL ) {
    1.17 -#ifdef HAVE_AYGSHELL
    1.18 -		/* Unhide taskbar, etc. */
    1.19 -		SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR);
    1.20 -		SHFullScreen(SDL_Window, SHFS_SHOWSIPBUTTON);
    1.21 -		ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL);
    1.22 -#endif
    1.23  		DestroyWindow(SDL_Window);
    1.24  	}
    1.25  }
     2.1 --- a/src/video/windib/SDL_dibvideo.c	Sun Oct 06 20:25:05 2002 +0000
     2.2 +++ b/src/video/windib/SDL_dibvideo.c	Sun Oct 06 20:31:34 2002 +0000
     2.3 @@ -29,8 +29,9 @@
     2.4  #include <stdlib.h>
     2.5  #include <malloc.h>
     2.6  #include <windows.h>
     2.7 -#ifdef HAVE_AYGSHELL
     2.8 -#include <aygshell.h>
     2.9 +#if defined(WIN32_PLATFORM_PSPC)
    2.10 +#include <aygshell.h>                      // Add Pocket PC includes
    2.11 +#pragma comment( lib, "aygshell" )         // Link Pocket PC library
    2.12  #endif
    2.13  
    2.14  /* Not yet in the mingw32 cross-compile headers */
    2.15 @@ -517,7 +518,7 @@
    2.16  	video->h = height;
    2.17  	video->pitch = SDL_CalculatePitch(video);
    2.18  
    2.19 -#ifdef HAVE_AYGSHELL
    2.20 +#ifdef WIN32_PLATFORM_PSPC
    2.21  	 /* Stuff to hide that $#!^%#$ WinCE taskbar in fullscreen... */
    2.22  	if ( flags & SDL_FULLSCREEN ) {
    2.23  		if ( !(prev_flags & SDL_FULLSCREEN) ) {
    2.24 @@ -918,6 +919,14 @@
    2.25  	if ( SDL_Window ) {
    2.26  		/* Delete the screen bitmap (also frees screen->pixels) */
    2.27  		if ( this->screen ) {
    2.28 +#ifdef WIN32_PLATFORM_PSPC
    2.29 +			if ( this->screen->flags & SDL_FULLSCREEN ) {
    2.30 +				/* Unhide taskbar, etc. */
    2.31 +				SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR);
    2.32 +				SHFullScreen(SDL_Window, SHFS_SHOWSIPBUTTON);
    2.33 +				ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL);
    2.34 +			}
    2.35 +#endif
    2.36  #ifndef NO_CHANGEDISPLAYSETTINGS
    2.37  			if ( this->screen->flags & SDL_FULLSCREEN ) {
    2.38  				ChangeDisplaySettings(NULL, 0);