m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add GFX2_Get_Window_Handle() to get the win32 HWND

Browse Source 
and use it
This commit is contained in:
Thomas Bernard
2018-06-25 10:23:19 +02:00
parent b6dec6d3f7
commit cb2d479867
7 changed files with 44 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/init.c
View File

@@ -52,9 +52,6 @@
#if defined(WIN32)
#include <windows.h> // GetLogicalDrives(), GetDriveType(), DRIVE_*
#endif
#if !defined(__GP2X__) && defined(USE_SDL)
#include <SDL_syswm.h>
#endif
#if defined (__MINT__)
#include <mint/osbind.h>
#endif
@@ -85,6 +82,7 @@
#include "mountlist.h" // read_file_system_list
#include "operatio.h"
#include "palette.h"
#include "screen.h"
#if defined(USE_SDL) || defined(USE_SDL2)
#include "sdlscreen.h"
#endif
@@ -3112,9 +3110,6 @@ void Define_icon(void)
LPVOID lpResIcon32;
HGLOBAL hMem;
WORD nID;
#if defined(USE_SDL) || defined(USE_SDL2)
SDL_SysWMinfo info;
#endif
hInstance = (HINSTANCE)GetModuleHandle(NULL);
if (hInstance==NULL)
@@ -3136,11 +3131,6 @@ void Define_icon(void)
if (lpResIconDir==NULL)
break;
#if defined(USE_SDL) || defined(USE_SDL2)
SDL_VERSION(&info.version);
SDL_GetWMInfo(&info);
#endif
//
// 16x16
//
@@ -3175,7 +3165,7 @@ void Define_icon(void)
// Set it
#if defined(USE_SDL) || defined(USE_SDL2)
SetClassLongPtr(info.window, GCL_HICONSM, (LONG_PTR)hicon);
SetClassLongPtr(GFX2_Get_Window_Handle(), GCL_HICONSM, (LONG_PTR)hicon);
#else
// TODO
#endif
@@ -3215,7 +3205,7 @@ void Define_icon(void)
// Set it
#if defined(USE_SDL) || defined(USE_SDL2)
SetClassLongPtr(info.window, GCL_HICON, (LONG_PTR)hicon);
SetClassLongPtr(GFX2_Get_Window_Handle(), GCL_HICON, (LONG_PTR)hicon);
#else
// TODO
#endif