Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Rishel <rishel.nick@gmail.com>2020-05-24 02:17:03 +0300
committerNicholas Rishel <rishel.nick@gmail.com>2020-10-31 02:29:03 +0300
commitc4821079b71dd873841220477931368298249549 (patch)
tree5defb4054193a72ab531155b0d50df46966c7b87 /intern/ghost
parenta6e31482e9660f455090ef1f7b9727f2d1dcd9e0 (diff)
Fix type for physicalButton in wintabMouseToGhost.
Signed-off-by: Nicholas Rishel <rishel.nick@gmail.com>
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_WindowWin32.cpp4
-rw-r--r--intern/ghost/intern/GHOST_WindowWin32.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index e2d900a41b5..3d6eaeb7f20 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -1252,10 +1252,10 @@ void GHOST_WindowWin32::processWintabInfoChangeEvent(LPARAM lParam)
}
GHOST_TSuccess GHOST_WindowWin32::wintabMouseToGhost(UINT cursor,
- DWORD physicalButton,
+ WORD physicalButton,
GHOST_TButtonMask &ghostButton)
{
- const DWORD numButtons = 32;
+ const WORD numButtons = 32;
BYTE logicalButtons[numButtons] = {0};
BYTE systemButtons[numButtons] = {0};
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index 29e8de31699..43a6746f75f 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -633,7 +633,7 @@ class GHOST_WindowWin32 : public GHOST_Window {
* Convert Wintab system mapped (mouse) buttons into Ghost button mask
*/
GHOST_TSuccess wintabMouseToGhost(UINT cursor,
- DWORD physicalButton,
+ WORD physicalButton,
GHOST_TButtonMask &buttonMask);
GHOST_TWindowState m_normal_state;