WinRT: misc code cleanups regarding touch and mouse events, and also SDL-internal globals

src/core/winrt/SDL_winrtapp.cpp

@@ -37,12 +37,9 @@ extern "C" {
 }
 
 #include "../../video/winrt/SDL_winrtevents_c.h"
+#include "../../video/winrt/SDL_winrtvideo_cpp.h"
 #include "SDL_winrtapp.h"
 
-extern SDL_Window * WINRT_GlobalSDLWindow;
-extern SDL_VideoDevice * WINRT_GlobalSDLVideoDevice;
-extern SDL_DisplayMode WINRT_CalcDisplayModeUsingNativeWindow();
-
 
 // Compile-time debugging options:
 // To enable, uncomment; to disable, comment them out.

src/core/winrt/SDL_winrtapp.h

@@ -38,3 +38,5 @@ private:
     bool m_windowClosed;
     bool m_windowVisible;
 };
+
+extern SDL_WinRTApp ^ SDL_WinRTGlobalApp;

src/core/winrt/SDL_winrtxaml.cpp

@@ -30,18 +30,13 @@
 
 /* SDL includes */
 #include "SDL.h"
-//#include "SDL_error.h"
-//#include "SDL_log.h"
-//#include "SDL_main.h"
-//#include "SDL_system.h"
 #include "../../video/winrt/SDL_winrtevents_c.h"
+#include "../../video/winrt/SDL_winrtvideo_cpp.h"
+#include "SDL_winrtxaml_cpp.h"
 
 
-/* External globals: */
-extern SDL_Window * WINRT_GlobalSDLWindow;
 
-
-/* Internal globals: */
+/* SDL-internal globals: */
 SDL_bool WINRT_XAMLWasEnabled = SDL_FALSE;
 int (*WINRT_XAMLAppMainFunction)(int, char **) = NULL;
 

src/core/winrt/SDL_winrtxaml_cpp.h

@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_winrtxaml_h
+#define _SDL_winrtxaml_h
+
+#include "SDL_types.h"
+
+#ifdef __cplusplus
+extern SDL_bool WINRT_XAMLWasEnabled;
+extern int (*WINRT_XAMLAppMainFunction)(int, char **);
+#endif // ifdef __cplusplus
+
+#endif // ifndef _SDL_winrtxaml_h