diff options
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.cpp | 10 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.h | 7 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowSDL.cpp | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowSDL.h | 13 |
4 files changed, 24 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index da1836d88a0..98d52c20ba1 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -27,6 +27,7 @@ #include <assert.h> #include "GHOST_SystemSDL.h" +#include "GHOST_WindowSDL.h" #include "GHOST_WindowManager.h" @@ -66,14 +67,19 @@ GHOST_SystemSDL::createWindow(const STR_String& title, GHOST_TUns32 height, GHOST_TWindowState state, GHOST_TDrawingContextType type, - bool stereoVisual, + const bool stereoVisual, + const bool exclusive, const GHOST_TUns16 numOfAASamples, const GHOST_TEmbedderWindowID parentWindow ) { GHOST_WindowSDL *window = NULL; - window = new GHOST_WindowSDL(this, title, left, top, width, height, state, parentWindow, type, stereoVisual, numOfAASamples); + window = new GHOST_WindowSDL(this, title, + left, top, width, height, + state, parentWindow, type, + stereoVisual, exclusive, + numOfAASamples); if (window) { if (GHOST_kWindowStateFullScreen == state) { diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h index 776dc2f66a5..5ad4fe09833 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.h +++ b/intern/ghost/intern/GHOST_SystemSDL.h @@ -108,9 +108,10 @@ private: GHOST_TUns32 height, GHOST_TWindowState state, GHOST_TDrawingContextType type, - bool stereoVisual, - const GHOST_TUns16 numOfAASamples, - const GHOST_TEmbedderWindowID parentWindow + const bool stereoVisual, + const bool exclusive = false, + const GHOST_TUns16 numOfAASamples = 0, + const GHOST_TEmbedderWindowID parentWindow = 0 ); /* SDL specific */ diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp index 6641b28a20e..47f41ea40a9 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.cpp +++ b/intern/ghost/intern/GHOST_WindowSDL.cpp @@ -41,10 +41,11 @@ GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system, const GHOST_TEmbedderWindowID parentWindow, GHOST_TDrawingContextType type, const bool stereoVisual, + const bool exclusive, const GHOST_TUns16 numOfAASamples ) : - GHOST_Window(width, height, state, type, stereoVisual, numOfAASamples), + GHOST_Window(width, height, state, type, stereoVisual, exclusive, numOfAASamples), m_system(system), m_invalid_window(false), m_sdl_custom_cursor(NULL) diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index a39d9878ddd..8260a318cea 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -41,6 +41,7 @@ extern "C" { #endif class STR_String; +class GHOST_SystemSDL; class GHOST_WindowSDL : public GHOST_Window { @@ -64,9 +65,10 @@ public: GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, const GHOST_TEmbedderWindowID parentWindow, - GHOST_TDrawingContextType type, - const bool stereoVisual, - const GHOST_TUns16 numOfAASamples + GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone, + const bool stereoVisual = false, + const bool exclusive = false, + const GHOST_TUns16 numOfAASamples = 0 ); ~GHOST_WindowSDL(); @@ -166,6 +168,11 @@ protected: return GHOST_kSuccess; } + // TODO + GHOST_TSuccess beginFullScreen() const { return GHOST_kFailure; } + + GHOST_TSuccess endFullScreen() const { return GHOST_kFailure; } + }; |