Fix build errors in GHOST SDL
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 5 Nov 2019 14:33:23 +0000 (15:33 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 5 Nov 2019 14:38:03 +0000 (15:38 +0100)
intern/ghost/intern/GHOST_SystemSDL.cpp
intern/ghost/intern/GHOST_SystemSDL.h
intern/ghost/intern/GHOST_WindowSDL.cpp
intern/ghost/intern/GHOST_WindowSDL.h

index e3f6f4b6bb1269e543d18f6bb743eeed7be03a22..06a82db1de56ded73e66f1319e4a8eb9cabd6ba3 100644 (file)
@@ -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) {
index 942b6297c227d28b1876a25a49d5304af5c2e0a5..c69a7c740bca0b0ea0aad43aaf983e4a3c59af50 100644 (file)
@@ -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);
index 99988dd55cc4d89a03765726440d58ce1d38fb5c..e8d129f45fec69df687905e0b598703e6945fd0e 100644 (file)
@@ -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) \
index a5c2fa9b18570f2c626ad4355969f1863e6dd26a..d9342de4d698a3bcbb0b0f30f19e918831f84571 100644 (file)
@@ -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();