diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-05 17:33:23 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-05 17:38:03 +0300 |
commit | 1b46b7c42f6a7ce2e0506a1cedf6e2bd084c4894 (patch) | |
tree | 31ea8b1dee8386cb260b407c1834628b836eeba4 /intern | |
parent | 8c2672db0da108b8af849b83fe148976101a1710 (diff) |
Fix build errors in GHOST SDL
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowSDL.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowSDL.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index e3f6f4b6bb1..06a82db1de5 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -59,7 +59,7 @@ GHOST_IWindow *GHOST_SystemSDL::createWindow(const STR_String &title, GHOST_GLSettings glSettings, const bool exclusive, const bool /* is_dialog */, - const GHOST_TEmbedderWindowID parentWindow) + const GHOST_IWindow *parentWindow) { GHOST_WindowSDL *window = NULL; @@ -70,10 +70,10 @@ GHOST_IWindow *GHOST_SystemSDL::createWindow(const STR_String &title, width, height, state, - parentWindow, type, ((glSettings.flags & GHOST_glStereoVisual) != 0), - exclusive); + exclusive, + parentWindow); if (window) { if (GHOST_kWindowStateFullScreen == state) { diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h index 942b6297c22..c69a7c740bc 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.h +++ b/intern/ghost/intern/GHOST_SystemSDL.h @@ -90,7 +90,7 @@ class GHOST_SystemSDL : public GHOST_System { GHOST_GLSettings glSettings, const bool exclusive = false, const bool is_dialog = false, - const GHOST_TEmbedderWindowID parentWindow = 0); + const GHOST_IWindow *parentWindow = NULL); /* SDL specific */ GHOST_WindowSDL *findGhostWindow(SDL_Window *sdl_win); diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp index 99988dd55cc..e8d129f45fe 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.cpp +++ b/intern/ghost/intern/GHOST_WindowSDL.cpp @@ -33,10 +33,10 @@ GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system, GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, - const GHOST_TEmbedderWindowID parentWindow, GHOST_TDrawingContextType type, const bool stereoVisual, - const bool exclusive) + const bool exclusive, + const GHOST_IWindow *parentWindow) : GHOST_Window(width, height, state, stereoVisual, exclusive), m_system(system), m_valid_setup(false), @@ -557,7 +557,7 @@ static SDL_Cursor *sdl_ghost_CreateCursor( } /* TODO, this is currently never freed but it wont leak either. */ -static void getStandardCursorShape(GHOST_TStandardCursor shape) +static SDL_Cursor *getStandardCursorShape(GHOST_TStandardCursor shape) { if (sdl_std_cursor_array[0] == NULL) { #define DEF_CURSOR(name, ind) \ diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h index a5c2fa9b185..d9342de4d69 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.h +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -60,10 +60,10 @@ class GHOST_WindowSDL : public GHOST_Window { GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, - const GHOST_TEmbedderWindowID parentWindow, GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone, const bool stereoVisual = false, - const bool exclusive = false); + const bool exclusive = false, + const GHOST_IWindow *parentWindow = NULL); ~GHOST_WindowSDL(); |