diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_SystemWin32.cpp')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index aa8dad44799..a7cb4aee837 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -50,11 +50,7 @@ #include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" -#if defined(WITH_GL_EGL) -# include "GHOST_ContextEGL.h" -#else -# include "GHOST_ContextWGL.h" -#endif +#include "GHOST_ContextWGL.h" #ifdef WITH_INPUT_NDOF # include "GHOST_NDOFManagerWin32.h" @@ -1016,8 +1012,8 @@ void GHOST_SystemWin32::processWintabEvent(GHOST_WindowWin32 *window) void GHOST_SystemWin32::processPointerEvent( UINT type, GHOST_WindowWin32 *window, WPARAM wParam, LPARAM lParam, bool &eventHandled) { - /* Pointer events might fire when changing windows for a device which is set to use Wintab, even - * when when Wintab is left enabled but set to the bottom of Wintab overlap order. */ + /* Pointer events might fire when changing windows for a device which is set to use Wintab, + * even when Wintab is left enabled but set to the bottom of Wintab overlap order. */ if (!window->usingTabletAPI(GHOST_kTabletWinPointer)) { return; } @@ -1507,7 +1503,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, case WM_SYSKEYDOWN: case WM_KEYUP: case WM_SYSKEYUP: - /* These functions were replaced by WM_INPUT*/ + /* These functions were replaced by #WM_INPUT. */ case WM_CHAR: /* The WM_CHAR message is posted to the window with the keyboard focus when * a WM_KEYDOWN message is translated by the TranslateMessage function. WM_CHAR @@ -1638,7 +1634,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, } /* Reset pointer pen info if pen device has left tracking range. */ - if (pointerInfo.pointerType == PT_PEN && !IS_POINTER_INRANGE_WPARAM(wParam)) { + if (pointerInfo.pointerType == PT_PEN) { window->resetPointerPenInfo(); eventHandled = true; } @@ -1855,7 +1851,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * to perform any move or size change processing during the WM_WINDOWPOSCHANGED * message without calling DefWindowProc. */ - /* see WM_SIZE comment*/ + /* See #WM_SIZE comment. */ if (window->m_inLiveResize) { system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window)); system->dispatchEvents(); @@ -1893,10 +1889,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, case WM_DISPLAYCHANGE: { GHOST_Wintab *wt = window->getWintab(); if (wt) { - for (GHOST_IWindow *iter_win : system->getWindowManager()->getWindows()) { - GHOST_WindowWin32 *iter_win32win = (GHOST_WindowWin32 *)iter_win; - wt->remapCoordinates(); - } + wt->remapCoordinates(); } break; } |