WinRT: explicitly allowed only one window at a time, pending multimon…

…itor support (in SDL/WinRT)
libsdl-org · Oct 29, 2012 · 13c72d0 · 13c72d0
1 parent fa5f072
commit 13c72d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/video/windowsrt/SDL_WinRTApp.cpp b/src/video/windowsrt/SDL_WinRTApp.cpp
@@ -198,6 +198,11 @@ SDL_DisplayMode SDL_WinRTApp::GetMainDisplayMode()
     return mode;
 }
 
+bool SDL_WinRTApp::HasSDLWindowData() const
+{
+    return (m_sdlWindowData != NULL);
+}
+
 void SDL_WinRTApp::SetSDLWindowData(const SDL_WindowData* windowData)
 {
     m_sdlWindowData = windowData;

diff --git a/src/video/windowsrt/SDL_WinRTApp.h b/src/video/windowsrt/SDL_WinRTApp.h
@@ -23,6 +23,7 @@ ref class SDL_WinRTApp sealed : public Windows::ApplicationModel::Core::IFramewo
     // SDL-specific methods
     SDL_DisplayMode GetMainDisplayMode();
     void PumpEvents();
+    bool HasSDLWindowData() const;
     void SetSDLWindowData(const SDL_WindowData* windowData);
 
 protected:

diff --git a/src/video/windowsrt/SDL_winrtvideo.cpp b/src/video/windowsrt/SDL_winrtvideo.cpp
@@ -137,8 +137,13 @@ WINRT_VideoQuit(_THIS)
 int
 WINRT_CreateWindow(_THIS, SDL_Window * window)
 {
-    // TODO, WinRT: modify WINRT_Createwindow to ensure that, for now, only one window gets created
-    // (until multimonitor support is added to the WinRT port).
+    // Make sure that only one window gets created, at least until multimonitor
+    // support is added.
+    if (SDL_WinRTGlobalApp->HasSDLWindowData())
+    {
+        SDL_SetError("WinRT only supports one window");
+        return -1;
+    }
 
     SDL_WindowData *data;
     data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data));
@@ -163,7 +168,10 @@ WINRT_CreateWindow(_THIS, SDL_Window * window)
 void
 WINRT_DestroyWindow(_THIS, SDL_Window * window)
 {
-    SDL_WinRTGlobalApp->SetSDLWindowData(NULL);
+    if (SDL_WinRTGlobalApp->HasSDLWindowData())
+    {
+        SDL_WinRTGlobalApp->SetSDLWindowData(NULL);
+    }
 }