actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't change the application icon in OS X.

Browse Source
This commit is contained in:
Steve Checkoway
2003-06-25 02:31:33 +00:00
parent 000a0feb13
commit 8611441184
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SDL_utils.cpp
+7
View File
@@ -579,6 +579,12 @@ Uint8 mySDL_EventState(Uint8 type, int state)
#include "SDL_image.h" // for setting icon #include "SDL_image.h" // for setting icon
#include "SDL_rotozoom.h" // for setting icon #include "SDL_rotozoom.h" // for setting icon
#if defined(DARWIN) && DARWIN
void mySDL_WM_SetIcon( CString sIconFile )
{
#pragma unused(sIconFile)
}
#else /* !defined(DARWIN) || !DARWIN */
void mySDL_WM_SetIcon( CString sIconFile ) void mySDL_WM_SetIcon( CString sIconFile )
{ {
if( sIconFile.empty() ) if( sIconFile.empty() )
@@ -604,6 +610,7 @@ void mySDL_WM_SetIcon( CString sIconFile )
SDL_WM_SetIcon(srf, NULL /* derive from alpha */); SDL_WM_SetIcon(srf, NULL /* derive from alpha */);
SDL_FreeSurface(srf); SDL_FreeSurface(srf);
} }
#endif /* !defined(DARWIN) || !DARWIN */
struct SurfaceHeader struct SurfaceHeader
stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp
+3 -1
View File
@@ -19,7 +19,8 @@ LoadingWindow_SDL::LoadingWindow_SDL()
SDL_Surface *srf = IMG_ReadXPMFromArray(icon); SDL_Surface *srf = IMG_ReadXPMFromArray(icon);
SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF)); SDL_SetColorKey( srf, SDL_SRCCOLORKEY, SDL_MapRGB(srf->format, 0xFF, 0, 0xFF));
/* Windows icons are 32x32 and SDL can't resize them for us, which #if !defined(DARWIN) || !DARWIN
/* Windows icons are 32x32 and SDL can't resize them for us, which
* causes mask corruption. (Actually, the above icon *is* 32x32; * causes mask corruption. (Actually, the above icon *is* 32x32;
* this is here just in case it changes.) */ * this is here just in case it changes.) */
ConvertSDLSurface(srf, srf->w, srf->h, ConvertSDLSurface(srf, srf->w, srf->h,
@@ -29,6 +30,7 @@ LoadingWindow_SDL::LoadingWindow_SDL()
SDL_SetAlpha( srf, SDL_SRCALPHA, SDL_ALPHA_OPAQUE ); SDL_SetAlpha( srf, SDL_SRCALPHA, SDL_ALPHA_OPAQUE );
SDL_WM_SetIcon(srf, NULL /* derive from alpha */); SDL_WM_SetIcon(srf, NULL /* derive from alpha */);
SDL_FreeSurface(srf); SDL_FreeSurface(srf);
#endif
/* Load the BMP - we need it's dimensions */ /* Load the BMP - we need it's dimensions */