diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/GHOST_ISystem.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_System.h | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Window.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowManager.h | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowViewCocoa.h | 2 | ||||
-rw-r--r-- | intern/ghost/test/gears/GHOST_C-Test.c | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index aa893a66a9d..d9be1454cea 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -281,7 +281,7 @@ class GHOST_ISystem { const bool stereoVisual) = 0; /** - * Updates the resolution while in fullscreen mode. + * Updates the resolution while in full-screen mode. * \param setting: The new setting of the display. * \param window: Window displayed in full screen. * diff --git a/intern/ghost/intern/GHOST_System.h b/intern/ghost/intern/GHOST_System.h index 8c51b3421b2..83f8cb254ce 100644 --- a/intern/ghost/intern/GHOST_System.h +++ b/intern/ghost/intern/GHOST_System.h @@ -123,7 +123,7 @@ class GHOST_System : public GHOST_ISystem { const bool stereoVisual); /** - * Updates the resolution while in fullscreen mode. + * Updates the resolution while in full-screen mode. * \param setting: The new setting of the display. * \param window: Window displayed in full screen. * @@ -369,7 +369,7 @@ class GHOST_System : public GHOST_ISystem { virtual GHOST_TSuccess exit(); /** - * Creates a fullscreen window. + * Creates a full-screen window. * \param window: The window created. * \return Indication of success. */ @@ -399,7 +399,7 @@ class GHOST_System : public GHOST_ISystem { GHOST_EventPrinter *m_eventPrinter; #endif // WITH_GHOST_DEBUG - /** Settings of the display before the display went fullscreen. */ + /** Settings of the display before the display went full-screen. */ GHOST_DisplaySetting m_preFullScreenSetting; /** Which tablet API to use. */ diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index a9e659d3565..dbb41c7fddf 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -79,7 +79,7 @@ class GHOST_SystemCocoa : public GHOST_System { * \param state: The state of the window when opened. * \param type: The type of drawing context installed in this window. * \param glSettings: Misc OpenGL settings. - * \param exclusive: Use to show the window ontop and ignore others (used fullscreen). + * \param exclusive: Use to show the window on top and ignore others (used full-screen). * \param parentWindow: Parent (embedder) window. * \return The new window (or 0 if creation failed). */ diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 81c565ae732..f5cd0055b34 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -105,7 +105,7 @@ class GHOST_SystemWin32 : public GHOST_System { * \param state: The state of the window when opened. * \param type: The type of drawing context installed in this window. * \param glSettings: Misc OpenGL settings. - * \param exclusive: Use to show the window ontop and ignore others (used fullscreen). + * \param exclusive: Use to show the window on top and ignore others (used full-screen). * \param parentWindow: Parent window. * \return The new window (or 0 if creation failed). */ diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index bd6ace101e9..33376d36a92 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -115,7 +115,7 @@ class GHOST_SystemX11 : public GHOST_System { * \param state: The state of the window when opened. * \param type: The type of drawing context installed in this window. * \param stereoVisual: Create a stereo visual for quad buffered stereo. - * \param exclusive: Use to show the window ontop and ignore others (used full*screen). + * \param exclusive: Use to show the window on top and ignore others (used full-screen). * \param parentWindow: Parent (embedder) window. * \return The new window (or 0 if creation failed). */ diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index 5ff91c05b16..2c2b75a6bd5 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -29,7 +29,7 @@ class GHOST_Window : public GHOST_IWindow { * \param height: The height of the window. * \param state: The state the window is initially opened with. * \param wantStereoVisual: Stereo visual for quad buffered stereo. - * \param exclusive: Use to show the window ontop and ignore others (used full-screen). + * \param exclusive: Use to show the window on top and ignore others (used full-screen). */ GHOST_Window(uint32_t width, uint32_t height, diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index e7f5fdaa011..737fd64bdf0 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -719,7 +719,7 @@ void GHOST_WindowCocoa::setNativePixelSize(void) } /** - * \note Fullscreen switch is not actual fullscreen with display capture. + * \note Full-screen switch is not actual fullscreen with display capture. * As this capture removes all OS X window manager features. * * Instead, the menu bar and the dock are hidden, and the window is made border-less and enlarged. diff --git a/intern/ghost/intern/GHOST_WindowManager.h b/intern/ghost/intern/GHOST_WindowManager.h index bf7a0f4ec61..a0a58fa82d8 100644 --- a/intern/ghost/intern/GHOST_WindowManager.h +++ b/intern/ghost/intern/GHOST_WindowManager.h @@ -113,13 +113,13 @@ class GHOST_WindowManager { /** The list of windows managed */ std::vector<GHOST_IWindow *> m_windows; - /** Window in fullscreen state. There can be only one of this which is not in or window list. */ + /** Window in full-screen state. There can be only one of this which is not in or window list. */ GHOST_IWindow *m_fullScreenWindow; /** The active window. */ GHOST_IWindow *m_activeWindow; - /** Window that was active before entering fullscreen state. */ + /** Window that was active before entering full-screen state. */ GHOST_IWindow *m_activeWindowBeforeFullScreen; #ifdef WITH_CXX_GUARDEDALLOC diff --git a/intern/ghost/intern/GHOST_WindowViewCocoa.h b/intern/ghost/intern/GHOST_WindowViewCocoa.h index 58c029620da..29653bd5ea2 100644 --- a/intern/ghost/intern/GHOST_WindowViewCocoa.h +++ b/intern/ghost/intern/GHOST_WindowViewCocoa.h @@ -226,7 +226,7 @@ [super drawRect:rect]; systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate, associatedWindow); - /* For some cases like entering fullscreen we need to redraw immediately + /* For some cases like entering full-screen we need to redraw immediately * so our window does not show blank during the animation */ if (associatedWindow->getImmediateDraw()) systemCocoa->dispatchEvents(); diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index 46c8fda0665..1ecc4b481d3 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -315,7 +315,7 @@ bool processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData) } break; case GHOST_kKeyF: if (!GHOST_GetFullScreen(shSystem)) { - /* Begin fullscreen mode */ + /* Begin full-screen mode. */ setting.bpp = 24; setting.frequency = 85; setting.xPixels = 640; |