From 7be2ad71c9e6bca274d9e9a83cae7ce7bc652635 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Tue, 27 Aug 2013 11:44:43 -0400 Subject: [PATCH] WinRT: renamed SDL_SYSWM_WINDOWSRT to SDL_SYSWM_WINRT This is part of an overall effort to use the name, "WinRT", rather than "WindowsRT" (or "Windows RT"), as the shorthand name often seems to mean something different than the longhand name. (WinRT is an API, Windows RT is a product name) --- include/SDL_syswm.h | 2 +- src/render/direct3d11/SDL_render_d3d11.cpp | 2 +- src/video/winrt/SDL_winrtvideo.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index 3b503ae74..5fc8fc419 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -105,7 +105,7 @@ typedef enum { SDL_SYSWM_UNKNOWN, SDL_SYSWM_WINDOWS, - SDL_SYSWM_WINDOWSRT, + SDL_SYSWM_WINRT, SDL_SYSWM_X11, SDL_SYSWM_DIRECTFB, SDL_SYSWM_COCOA, diff --git a/src/render/direct3d11/SDL_render_d3d11.cpp b/src/render/direct3d11/SDL_render_d3d11.cpp index 9d34d0d81..fd6e03459 100644 --- a/src/render/direct3d11/SDL_render_d3d11.cpp +++ b/src/render/direct3d11/SDL_render_d3d11.cpp @@ -583,7 +583,7 @@ D3D11_GetCoreWindowFromSDLRenderer(SDL_Renderer * renderer) return nullptr; } - if (sdlWindowInfo.subsystem != SDL_SYSWM_WINDOWSRT) { + if (sdlWindowInfo.subsystem != SDL_SYSWM_WINRT) { return nullptr; } diff --git a/src/video/winrt/SDL_winrtvideo.cpp b/src/video/winrt/SDL_winrtvideo.cpp index 03ff7730e..bc6dd1dc8 100644 --- a/src/video/winrt/SDL_winrtvideo.cpp +++ b/src/video/winrt/SDL_winrtvideo.cpp @@ -230,7 +230,7 @@ WINRT_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) SDL_WindowData * data = (SDL_WindowData *) window->driverdata; if (info->version.major <= SDL_MAJOR_VERSION) { - info->subsystem = SDL_SYSWM_WINDOWSRT; + info->subsystem = SDL_SYSWM_WINRT; info->info.winrt.window = reinterpret_cast(data->coreWindow.Get()); return SDL_TRUE; } else {