mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-02-15 08:47:36 +00:00
isleapp: Remove _WIN32 ifdefs
This is closer to the original code. I thought it would let Windows set the icon itself not set the icon upon window creation.
This commit is contained in:
parent
b2569bcd55
commit
258ce038a3
@ -486,7 +486,6 @@ MxResult IsleApp::SetupWindow()
|
|||||||
return FAILURE;
|
return FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _WIN32
|
|
||||||
SDL_Surface* icon = SDL_CreateSurfaceFrom(
|
SDL_Surface* icon = SDL_CreateSurfaceFrom(
|
||||||
ISLE_ICON.width,
|
ISLE_ICON.width,
|
||||||
ISLE_ICON.height,
|
ISLE_ICON.height,
|
||||||
@ -499,7 +498,6 @@ MxResult IsleApp::SetupWindow()
|
|||||||
SDL_SetWindowIcon(m_windowHandle, icon);
|
SDL_SetWindowIcon(m_windowHandle, icon);
|
||||||
SDL_DestroySurface(icon);
|
SDL_DestroySurface(icon);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!SetupLegoOmni()) {
|
if (!SetupLegoOmni()) {
|
||||||
return FAILURE;
|
return FAILURE;
|
||||||
|
|||||||
@ -4,6 +4,4 @@
|
|||||||
|
|
||||||
#define APP_ICON 105
|
#define APP_ICON 105
|
||||||
|
|
||||||
#ifndef _WIN32
|
|
||||||
#include "isle.h"
|
#include "isle.h"
|
||||||
#endif
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user