From 364d0621ed1ec6e39d7f3521da24e9f99a7f9b4d Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 6 Oct 2002 20:31:34 +0000
Subject: [PATCH] *** empty log message ***

---
 src/video/windib/SDL_dibevents.c |  9 ---------
 src/video/windib/SDL_dibvideo.c  | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c
index e65225d3f..8a49ddced 100644
--- a/src/video/windib/SDL_dibevents.c
+++ b/src/video/windib/SDL_dibevents.c
@@ -28,9 +28,6 @@ static char rcsid =
 #include <stdlib.h>
 #include <stdio.h>
 #include <windows.h>
-#ifdef HAVE_AYGSHELL
-#include <aygshell.h>
-#endif
 
 #include "SDL_events.h"
 #include "SDL_error.h"
@@ -366,12 +363,6 @@ int DIB_CreateWindow(_THIS)
 void DIB_DestroyWindow(_THIS)
 {
 	if ( SDL_windowid == NULL ) {
-#ifdef HAVE_AYGSHELL
-		/* Unhide taskbar, etc. */
-		SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR);
-		SHFullScreen(SDL_Window, SHFS_SHOWSIPBUTTON);
-		ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL);
-#endif
 		DestroyWindow(SDL_Window);
 	}
 }
diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c
index 68c1c067a..7249e637b 100644
--- a/src/video/windib/SDL_dibvideo.c
+++ b/src/video/windib/SDL_dibvideo.c
@@ -29,8 +29,9 @@ static char rcsid =
 #include <stdlib.h>
 #include <malloc.h>
 #include <windows.h>
-#ifdef HAVE_AYGSHELL
-#include <aygshell.h>
+#if defined(WIN32_PLATFORM_PSPC)
+#include <aygshell.h>                      // Add Pocket PC includes
+#pragma comment( lib, "aygshell" )         // Link Pocket PC library
 #endif
 
 /* Not yet in the mingw32 cross-compile headers */
@@ -517,7 +518,7 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current,
 	video->h = height;
 	video->pitch = SDL_CalculatePitch(video);
 
-#ifdef HAVE_AYGSHELL
+#ifdef WIN32_PLATFORM_PSPC
 	 /* Stuff to hide that $#!^%#$ WinCE taskbar in fullscreen... */
 	if ( flags & SDL_FULLSCREEN ) {
 		if ( !(prev_flags & SDL_FULLSCREEN) ) {
@@ -918,6 +919,14 @@ void DIB_VideoQuit(_THIS)
 	if ( SDL_Window ) {
 		/* Delete the screen bitmap (also frees screen->pixels) */
 		if ( this->screen ) {
+#ifdef WIN32_PLATFORM_PSPC
+			if ( this->screen->flags & SDL_FULLSCREEN ) {
+				/* Unhide taskbar, etc. */
+				SHFullScreen(SDL_Window, SHFS_SHOWTASKBAR);
+				SHFullScreen(SDL_Window, SHFS_SHOWSIPBUTTON);
+				ShowWindow(FindWindow(TEXT("HHTaskBar"),NULL),SW_SHOWNORMAL);
+			}
+#endif
 #ifndef NO_CHANGEDISPLAYSETTINGS
 			if ( this->screen->flags & SDL_FULLSCREEN ) {
 				ChangeDisplaySettings(NULL, 0);