diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:49:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:50:14 +0300 |
commit | da53c3f02006b87e80ae898d1927a215b97cc934 (patch) | |
tree | f6c00c72822ad164586540a3602a20a3d4f9b6fb /intern/ghost/GHOST_C-api.h | |
parent | c8af234f855ccd29d042f5298f7dea05922a350e (diff) | |
parent | 58e8c71cbd91931f97607ab8b028624b3e90455e (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost/GHOST_C-api.h')
-rw-r--r-- | intern/ghost/GHOST_C-api.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 071474e57dc..a911c4560e4 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -36,7 +36,7 @@ #include "GHOST_Types.h" #ifdef __cplusplus -extern "C" { +extern "C" { #endif /** @@ -103,7 +103,7 @@ extern GHOST_TUns64 GHOST_GetMilliSeconds(GHOST_SystemHandle systemhandle); /** * Installs a timer. - * Note that, on most operating systems, messages need to be processed in order + * Note that, on most operating systems, messages need to be processed in order * for the timer callbacks to be invoked. * \param systemhandle The handle to the system * \param delay The time to wait for the first call to the timerProc (in milliseconds) @@ -165,7 +165,7 @@ extern void GHOST_GetAllDisplayDimensions(GHOST_SystemHandle systemhandle, /** * Create a new window. - * The new window is added to the list of windows managed. + * The new window is added to the list of windows managed. * Never explicitly delete the window, use disposeWindow() instead. * \param systemhandle The handle to the system * \param title The name of the window (displayed in the title bar of the window if the OS supports it). @@ -218,7 +218,7 @@ extern GHOST_TUserDataPtr GHOST_GetWindowUserData(GHOST_WindowHandle windowhandl * \param windowhandle The handle to the window * \param userdata The window user data. */ -extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, +extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUserDataPtr userdata); /** @@ -488,7 +488,7 @@ extern GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle); extern GHOST_TUns64 GHOST_GetEventTime(GHOST_EventHandle eventhandle); /** - * Returns the window this event was generated on, + * Returns the window this event was generated on, * or NULL if it is a 'system' event. * \param eventhandle The handle to the event * \return The generating window. @@ -566,7 +566,7 @@ extern void GHOST_SetTitle(GHOST_WindowHandle windowhandle, /** * Returns the title displayed in the title bar. The title * should be free'd with free(). - * + * * \param windowhandle The handle to the window * \return The title, free with free(). */ |