blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix build errors in GHOST SDL

This commit is contained in:
Brecht Van Lommel 2019-11-05 15:33:23 +01:00
parent 8c2672db0d
commit 1b46b7c42f
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intern/ghost/intern/GHOST_SystemSDL.cpp
View 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) {

2
intern/ghost/intern/GHOST_SystemSDL.h
View 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);

6
intern/ghost/intern/GHOST_WindowSDL.cpp
View 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) \

4
intern/ghost/intern/GHOST_WindowSDL.h
View 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();