Commit 9c4b1795 authored by Sam Lantinga's avatar Sam Lantinga

*** empty log message ***

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40516
parent b34dca40
...@@ -28,9 +28,6 @@ static char rcsid = ...@@ -28,9 +28,6 @@ static char rcsid =
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <windows.h> #include <windows.h>
#ifdef HAVE_AYGSHELL
#include <aygshell.h>
#endif
#include "SDL_events.h" #include "SDL_events.h"
#include "SDL_error.h" #include "SDL_error.h"
...@@ -366,12 +363,6 @@ int DIB_CreateWindow(_THIS) ...@@ -366,12 +363,6 @@ int DIB_CreateWindow(_THIS)
void DIB_DestroyWindow(_THIS) void DIB_DestroyWindow(_THIS)
{ {
if ( SDL_windowid == NULL ) { 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); DestroyWindow(SDL_Window);
} }
} }
...@@ -29,8 +29,9 @@ static char rcsid = ...@@ -29,8 +29,9 @@ static char rcsid =
#include <stdlib.h> #include <stdlib.h>
#include <malloc.h> #include <malloc.h>
#include <windows.h> #include <windows.h>
#ifdef HAVE_AYGSHELL #if defined(WIN32_PLATFORM_PSPC)
#include <aygshell.h> #include <aygshell.h> // Add Pocket PC includes
#pragma comment( lib, "aygshell" ) // Link Pocket PC library
#endif #endif
/* Not yet in the mingw32 cross-compile headers */ /* Not yet in the mingw32 cross-compile headers */
...@@ -517,7 +518,7 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current, ...@@ -517,7 +518,7 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current,
video->h = height; video->h = height;
video->pitch = SDL_CalculatePitch(video); video->pitch = SDL_CalculatePitch(video);
#ifdef HAVE_AYGSHELL #ifdef WIN32_PLATFORM_PSPC
/* Stuff to hide that $#!^%#$ WinCE taskbar in fullscreen... */ /* Stuff to hide that $#!^%#$ WinCE taskbar in fullscreen... */
if ( flags & SDL_FULLSCREEN ) { if ( flags & SDL_FULLSCREEN ) {
if ( !(prev_flags & SDL_FULLSCREEN) ) { if ( !(prev_flags & SDL_FULLSCREEN) ) {
...@@ -918,6 +919,14 @@ void DIB_VideoQuit(_THIS) ...@@ -918,6 +919,14 @@ void DIB_VideoQuit(_THIS)
if ( SDL_Window ) { if ( SDL_Window ) {
/* Delete the screen bitmap (also frees screen->pixels) */ /* Delete the screen bitmap (also frees screen->pixels) */
if ( this->screen ) { 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 #ifndef NO_CHANGEDISPLAYSETTINGS
if ( this->screen->flags & SDL_FULLSCREEN ) { if ( this->screen->flags & SDL_FULLSCREEN ) {
ChangeDisplaySettings(NULL, 0); ChangeDisplaySettings(NULL, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment