mirror of https://github.com/encounter/SDL.git
WinRT: made SDL_GetWindowWMInfo return window data in a slightly easier-to-use format
Having the window pointer available as a WinRT IInspectable should make it a bit easier to use in conjunction with WRL-based weak references.
This commit is contained in:
parent
fa45a9c953
commit
0022dbf261
|
@ -57,7 +57,7 @@ struct SDL_SysWMinfo;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
||||||
#include <Unknwn.h>
|
#include <Inspectable.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* This is the structure for custom window manager events */
|
/* This is the structure for custom window manager events */
|
||||||
|
@ -177,7 +177,7 @@ struct SDL_SysWMinfo
|
||||||
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
IUnknown * window; /**< The WinRT CoreWindow */
|
IInspectable * window; /**< The WinRT CoreWindow */
|
||||||
} winrt;
|
} winrt;
|
||||||
#endif
|
#endif
|
||||||
#if defined(SDL_VIDEO_DRIVER_X11)
|
#if defined(SDL_VIDEO_DRIVER_X11)
|
||||||
|
|
|
@ -300,7 +300,7 @@ WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
|
||||||
|
|
||||||
if (info->version.major <= SDL_MAJOR_VERSION) {
|
if (info->version.major <= SDL_MAJOR_VERSION) {
|
||||||
info->subsystem = SDL_SYSWM_WINRT;
|
info->subsystem = SDL_SYSWM_WINRT;
|
||||||
info->info.winrt.window = reinterpret_cast<IUnknown *>(data->coreWindow.Get());
|
info->info.winrt.window = reinterpret_cast<IInspectable *>(data->coreWindow.Get());
|
||||||
return SDL_TRUE;
|
return SDL_TRUE;
|
||||||
} else {
|
} else {
|
||||||
SDL_SetError("Application not compiled with SDL %d.%d\n",
|
SDL_SetError("Application not compiled with SDL %d.%d\n",
|
||||||
|
|
Loading…
Reference in New Issue