Merge branch 'master' into blender2.8
[blender.git] / intern / ghost / intern / GHOST_C-api.cpp
index c89ef49..90956cf 100644 (file)
@@ -119,7 +119,7 @@ void GHOST_GetMainDisplayDimensions(GHOST_SystemHandle systemhandle,
                                     GHOST_TUns32 *height)
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
-       
+
        system->getMainDisplayDimensions(*width, *height);
 }
 
@@ -182,7 +182,7 @@ GHOST_TSuccess GHOST_DisposeWindow(GHOST_SystemHandle systemhandle,
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
-       
+
        return system->disposeWindow(window);
 }
 
@@ -193,7 +193,7 @@ int GHOST_ValidWindow(GHOST_SystemHandle systemhandle,
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
-       
+
        return (int) system->validWindow(window);
 }
 
@@ -211,7 +211,7 @@ GHOST_WindowHandle GHOST_BeginFullScreen(GHOST_SystemHandle systemhandle,
                bstereoVisual = true;
        else
                bstereoVisual = false;
-       
+
        system->beginFullScreen(*setting, &window, bstereoVisual);
 
        return (GHOST_WindowHandle)window;
@@ -240,7 +240,7 @@ int GHOST_GetFullScreen(GHOST_SystemHandle systemhandle)
 int GHOST_ProcessEvents(GHOST_SystemHandle systemhandle, int waitForEvent)
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
-       
+
        return (int) system->processEvents(waitForEvent ? true : false);
 }
 
@@ -249,7 +249,7 @@ int GHOST_ProcessEvents(GHOST_SystemHandle systemhandle, int waitForEvent)
 void GHOST_DispatchEvents(GHOST_SystemHandle systemhandle)
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
-       
+
        system->dispatchEvents();
 }
 
@@ -257,7 +257,7 @@ void GHOST_DispatchEvents(GHOST_SystemHandle systemhandle)
 GHOST_TSuccess GHOST_AddEventConsumer(GHOST_SystemHandle systemhandle, GHOST_EventConsumerHandle consumerhandle)
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
-       
+
        return system->addEventConsumer((GHOST_CallbackEventConsumer *)consumerhandle);
 }
 
@@ -353,7 +353,7 @@ GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
                                        GHOST_TInt32 *y)
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
-       
+
        return system->getCursorPosition(*x, *y);
 }
 
@@ -364,7 +364,7 @@ GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
                                        GHOST_TInt32 y)
 {
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
-       
+
        return system->setCursorPosition(x, y);
 }
 
@@ -398,7 +398,7 @@ GHOST_TSuccess GHOST_GetModifierKeyState(GHOST_SystemHandle systemhandle,
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
        GHOST_TSuccess result;
        bool isdown = false;
-       
+
        result = system->getModifierKeyState(mask, isdown);
        *isDown = (int) isdown;
 
@@ -414,7 +414,7 @@ GHOST_TSuccess GHOST_GetButtonState(GHOST_SystemHandle systemhandle,
        GHOST_ISystem *system = (GHOST_ISystem *) systemhandle;
        GHOST_TSuccess result;
        bool isdown = false;
-       
+
        result = system->getButtonState(mask, isdown);
        *isDown = (int) isdown;
 
@@ -441,7 +441,7 @@ void GHOST_setAcceptDragOperation(GHOST_WindowHandle windowhandle, GHOST_TInt8 c
 GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle)
 {
        GHOST_IEvent *event = (GHOST_IEvent *) eventhandle;
-       
+
        return event->getType();
 }
 
@@ -466,7 +466,7 @@ GHOST_WindowHandle GHOST_GetEventWindow(GHOST_EventHandle eventhandle)
 GHOST_TEventDataPtr GHOST_GetEventData(GHOST_EventHandle eventhandle)
 {
        GHOST_IEvent *event = (GHOST_IEvent *) eventhandle;
-       
+
        return event->getData();
 }
 
@@ -475,7 +475,7 @@ GHOST_TEventDataPtr GHOST_GetEventData(GHOST_EventHandle eventhandle)
 GHOST_TimerProcPtr GHOST_GetTimerProc(GHOST_TimerTaskHandle timertaskhandle)
 {
        GHOST_ITimerTask *timertask = (GHOST_ITimerTask *) timertaskhandle;
-       
+
        return timertask->getTimerProc();
 }
 
@@ -485,7 +485,7 @@ void GHOST_SetTimerProc(GHOST_TimerTaskHandle timertaskhandle,
                         GHOST_TimerProcPtr timerproc)
 {
        GHOST_ITimerTask *timertask = (GHOST_ITimerTask *) timertaskhandle;
-       
+
        timertask->setTimerProc(timerproc);
 }
 
@@ -504,13 +504,13 @@ void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle,
                                 GHOST_TUserDataPtr userdata)
 {
        GHOST_ITimerTask *timertask = (GHOST_ITimerTask *) timertaskhandle;
-       
+
        timertask->setUserData(userdata);
 }
 
 
 
-int GHOST_GetValid(GHOST_WindowHandle windowhandle) 
+int GHOST_GetValid(GHOST_WindowHandle windowhandle)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
 
@@ -542,7 +542,7 @@ void GHOST_SetTitle(GHOST_WindowHandle windowhandle,
                     const char *title)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
-       
+
        window->setTitle(title);
 }
 
@@ -567,7 +567,7 @@ char *GHOST_GetTitle(GHOST_WindowHandle windowhandle)
 
 
 
-GHOST_RectangleHandle GHOST_GetWindowBounds(GHOST_WindowHandle windowhandle) 
+GHOST_RectangleHandle GHOST_GetWindowBounds(GHOST_WindowHandle windowhandle)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
        GHOST_Rect *rectangle = NULL;
@@ -580,7 +580,7 @@ GHOST_RectangleHandle GHOST_GetWindowBounds(GHOST_WindowHandle windowhandle)
 
 
 
-GHOST_RectangleHandle GHOST_GetClientBounds(GHOST_WindowHandle windowhandle) 
+GHOST_RectangleHandle GHOST_GetClientBounds(GHOST_WindowHandle windowhandle)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
        GHOST_Rect *rectangle = NULL;
@@ -678,16 +678,16 @@ GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle,
 GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle, GHOST_TUns8 isUnsavedChanges)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
-       
+
        return window->setModifiedState(isUnsavedChanges);
-}      
+}
 
 
 GHOST_TSuccess GHOST_SetWindowOrder(GHOST_WindowHandle windowhandle,
                                     GHOST_TWindowOrder order)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
-       
+
        return window->setOrder(order);
 }
 
@@ -725,7 +725,7 @@ GHOST_TUns16 GHOST_GetNumOfAASamples(GHOST_WindowHandle windowhandle)
 GHOST_TSuccess GHOST_ActivateWindowDrawingContext(GHOST_WindowHandle windowhandle)
 {
        GHOST_IWindow *window = (GHOST_IWindow *) windowhandle;
-       
+
        return window->activateDrawingContext();
 }