diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_WindowWin32.cpp')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 64ea7192616..efcb389363d 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -62,8 +62,7 @@ extern "C" { __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; } -GHOST_WindowWin32::GHOST_WindowWin32( - GHOST_SystemWin32 *system, +GHOST_WindowWin32::GHOST_WindowWin32(GHOST_SystemWin32 *system, const STR_String &title, GHOST_TInt32 left, GHOST_TInt32 top, @@ -71,7 +70,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( GHOST_TUns32 height, GHOST_TWindowState state, GHOST_TDrawingContextType type, - bool wantStereoVisual, + bool wantStereoVisual, bool warnOld, GHOST_TUns16 wantNumOfAASamples, GHOST_TEmbedderWindowID parentwindowhwnd) : GHOST_Window(width, height, state, @@ -97,6 +96,13 @@ GHOST_WindowWin32::GHOST_WindowWin32( versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); +#if !defined(WITH_GL_EGL) + if (!warnOld) + GHOST_ContextWGL::unSetWarningOld(); +#else + (void)(warnOld); +#endif + if (!GetVersionEx((OSVERSIONINFO *)&versionInfo)) { versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); if (GetVersionEx((OSVERSIONINFO *)&versionInfo)) { @@ -1050,3 +1056,16 @@ GHOST_TSuccess GHOST_WindowWin32::endProgressBar() return GHOST_kFailure; } + +#ifdef WITH_INPUT_IME +void GHOST_WindowWin32::beginIME(GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed) +{ + m_imeImput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), (bool)completed); +} + + +void GHOST_WindowWin32::endIME() +{ + m_imeImput.EndIME(m_hWnd); +} +#endif /* WITH_INPUT_IME */ |