*** empty log message *** release-1.2.5
authorSam Lantinga <slouken@libsdl.org>
Sun, 06 Oct 2002 20:31:34 +0000
changeset 515 230b156829ed
parent 514 1080bfc4aa96
child 516 6636b20693a8
*** empty log message ***
src/video/windib/SDL_dibevents.c
src/video/windib/SDL_dibvideo.c
--- a/src/video/windib/SDL_dibevents.c	Sun Oct 06 20:25:05 2002 +0000
+++ b/src/video/windib/SDL_dibevents.c	Sun Oct 06 20:31:34 2002 +0000
@@ -28,9 +28,6 @@
 #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 @@
 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);
 	}
 }
--- a/src/video/windib/SDL_dibvideo.c	Sun Oct 06 20:25:05 2002 +0000
+++ b/src/video/windib/SDL_dibvideo.c	Sun Oct 06 20:31:34 2002 +0000
@@ -29,8 +29,9 @@
 #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 @@
 	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 @@
 	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);