[Bf-blender-cvs] [c4821079b71] master: Fix type for physicalButton in wintabMouseToGhost.

[Nicholas Rishel]

Commit: c4821079b71dd873841220477931368298249549
Author: Nicholas Rishel
Date:   Sat May 23 16:17:03 2020 -0700
Branches: master
https://developer.blender.org/rBc4821079b71dd873841220477931368298249549

Fix type for physicalButton in wintabMouseToGhost.

Signed-off-by: Nicholas Rishel <rishel.nick at gmail.com>

===================================================================

M	intern/ghost/intern/GHOST_WindowWin32.cpp
M	intern/ghost/intern/GHOST_WindowWin32.h

===================================================================

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;