From 3bbb39ecc114ddd2c5c3fc91e1376e1cc33f55b7 Mon Sep 17 00:00:00 2001 From: Nicholas Rishel Date: Mon, 17 Jan 2022 12:58:54 -0800 Subject: Cleanup: remove HWND from GHOST_Wintab constructor. No change in behavior. --- intern/ghost/intern/GHOST_Wintab.cpp | 6 ++---- intern/ghost/intern/GHOST_Wintab.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_Wintab.cpp b/intern/ghost/intern/GHOST_Wintab.cpp index d13d1a560b7..953fcb171e5 100644 --- a/intern/ghost/intern/GHOST_Wintab.cpp +++ b/intern/ghost/intern/GHOST_Wintab.cpp @@ -130,8 +130,7 @@ GHOST_Wintab *GHOST_Wintab::loadWintab(HWND hwnd) } } - return new GHOST_Wintab(hwnd, - std::move(handle), + return new GHOST_Wintab(std::move(handle), info, get, set, @@ -174,8 +173,7 @@ void GHOST_Wintab::extractCoordinates(LOGCONTEXT &lc, Coord &tablet, Coord &syst system.y.ext = -lc.lcSysExtY; } -GHOST_Wintab::GHOST_Wintab(HWND hwnd, - unique_hmodule handle, +GHOST_Wintab::GHOST_Wintab(unique_hmodule handle, GHOST_WIN32_WTInfo info, GHOST_WIN32_WTGet get, GHOST_WIN32_WTSet set, diff --git a/intern/ghost/intern/GHOST_Wintab.h b/intern/ghost/intern/GHOST_Wintab.h index c61b1c8ccda..1994f057db9 100644 --- a/intern/ghost/intern/GHOST_Wintab.h +++ b/intern/ghost/intern/GHOST_Wintab.h @@ -214,8 +214,7 @@ class GHOST_Wintab { /** Most recently received tablet data, or none if pen is not in range. */ GHOST_TabletData m_lastTabletData = GHOST_TABLET_DATA_NONE; - GHOST_Wintab(HWND hwnd, - unique_hmodule handle, + GHOST_Wintab(unique_hmodule handle, GHOST_WIN32_WTInfo info, GHOST_WIN32_WTGet get, GHOST_WIN32_WTSet set, -- cgit v1.2.3