summaryrefslogtreecommitdiff
path: root/src/gui/windowmanager.cpp
diff options
context:
space:
mode:
authorcuoco <cuoco@themanaworld.org>2023-05-15 12:05:49 +0200
committercuoco <cuoco@themanaworld.org>2023-05-15 12:05:49 +0200
commit3c960310317d589ec81ef4ac0aa334a495ac50fc (patch)
treecc21b4e71d3840be1ee4f569497e7fc65d06d99c /src/gui/windowmanager.cpp
parentf35e0155e1c7a2f684a2fe5d5b98b8d2e06050bc (diff)
parent279c7ba28804960ae3b2ec0753b4c3a92d5a6ede (diff)
downloadplus-3c960310317d589ec81ef4ac0aa334a495ac50fc.tar.gz
plus-3c960310317d589ec81ef4ac0aa334a495ac50fc.tar.bz2
plus-3c960310317d589ec81ef4ac0aa334a495ac50fc.tar.xz
plus-3c960310317d589ec81ef4ac0aa334a495ac50fc.zip
Merge branch 'master' of https://git.themanaworld.org/mana/plus
Diffstat (limited to 'src/gui/windowmanager.cpp')
-rw-r--r--src/gui/windowmanager.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 15a536f15..79e6cb47c 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -449,11 +449,19 @@ void WindowManager::setIcon()
if (icon)
{
#ifdef WIN64
+#ifdef USE_SDL2
+ SetClassLongPtr(pInfo.info.win.window,
+#else
SetClassLongPtr(pInfo.window,
+#endif // USE_SDL2
GCLP_HICON,
reinterpret_cast<LONG_PTR>(icon));
#else // WIN64
+#ifdef USE_SDL2
+ SetClassLong(pInfo.info.win.window,
+#else
SetClassLong(pInfo.window,
+#endif // USE_SDL2
GCL_HICON,
reinterpret_cast<LONG>(icon));
#endif // WIN64