Bug 1352368 - Remove some old Windows defines from WinMessages.h r=jwatt draft
authorFarmer Tseng <fatseng@mozilla.com>
Sat, 01 Apr 2017 00:44:26 +0800
changeset 554478 fcaadb93be6ff43f36ba98f164018d93c98a4e22
parent 554477 2b6bb2b6a6b0464b9c01c055101b23373d386c0f
child 622344 022788f15cbabb602bb83e89fd93d8a218762599
push id51941
push userbmo:fatseng@mozilla.com
push dateFri, 31 Mar 2017 16:45:03 +0000
reviewersjwatt
bugs1352368
milestone54.0a1
Bug 1352368 - Remove some old Windows defines from WinMessages.h r=jwatt These defines cause include ordering issues that can result in build errors if WinMessages.h is included before certain Windows headers. To solve this issue this commit simply removes those defines since nowadays we require Visua Studio 2015 to build and no longer need them. MozReview-Commit-ID: GHMU05GUwHM
widget/windows/WinMessages.h
--- a/widget/windows/WinMessages.h
+++ b/widget/windows/WinMessages.h
@@ -45,102 +45,19 @@
 #define MOZ_WM_DEADCHAR                   (WM_APP+0x031E)
 #define MOZ_WM_SYSDEADCHAR                (WM_APP+0x031F)
 
 // XXX Should rename them to MOZ_WM_* and use safer values!
 // Messages for fullscreen transition window
 #define WM_FULLSCREEN_TRANSITION_BEFORE   (WM_USER + 0)
 #define WM_FULLSCREEN_TRANSITION_AFTER    (WM_USER + 1)
 
-/*****************************************************************************
- * WM_* messages and related constants which may not be defined by
- * old Windows SDK
- ****************************************************************************/
-
-#ifndef SM_CXPADDEDBORDER
-#define SM_CXPADDEDBORDER                 92
-#endif
-
-// require WINVER >= 0x601
-#ifndef SM_MAXIMUMTOUCHES
-#define SM_MAXIMUMTOUCHES                 95
-#endif
-
-#ifndef WM_THEMECHANGED
-#define WM_THEMECHANGED                   0x031A
-#endif
-
-#ifndef WM_GETOBJECT
-#define WM_GETOBJECT                      0x03d
-#endif
-
-#ifndef PBT_APMRESUMEAUTOMATIC
-#define PBT_APMRESUMEAUTOMATIC            0x0012
-#endif
-
-#ifndef WM_MOUSEHWHEEL
-#define WM_MOUSEHWHEEL                    0x020E
-#endif
-
-#ifndef MOUSEEVENTF_HWHEEL
-#define MOUSEEVENTF_HWHEEL                0x01000
-#endif
-
-#ifndef WM_MOUSELEAVE
-#define WM_MOUSELEAVE                     0x02A3
-#endif
-
-#ifndef SPI_GETWHEELSCROLLCHARS
-#define SPI_GETWHEELSCROLLCHARS           0x006C
-#endif
-
-#ifndef SPI_SETWHEELSCROLLCHARS
-#define SPI_SETWHEELSCROLLCHARS           0x006D
-#endif
-
-#ifndef MAPVK_VSC_TO_VK
-#define MAPVK_VK_TO_VSC                   0
-#define MAPVK_VSC_TO_VK                   1
-#define MAPVK_VK_TO_CHAR                  2
-#define MAPVK_VSC_TO_VK_EX                3
-#define MAPVK_VK_TO_VSC_EX                4
-#endif
-
-#ifndef WM_DWMCOMPOSITIONCHANGED
-#define WM_DWMCOMPOSITIONCHANGED          0x031E
-#endif
-#ifndef WM_DWMNCRENDERINGCHANGED
-#define WM_DWMNCRENDERINGCHANGED          0x031F
-#endif
-#ifndef WM_DWMCOLORIZATIONCOLORCHANGED
-#define WM_DWMCOLORIZATIONCOLORCHANGED    0x0320
-#endif
-#ifndef WM_DWMWINDOWMAXIMIZEDCHANGE
-#define WM_DWMWINDOWMAXIMIZEDCHANGE       0x0321
-#endif
-
 // Drop shadow window style
 #define CS_XP_DROPSHADOW                  0x00020000
 
-// App Command messages for IntelliMouse and Natural Keyboard Pro
-// These messages are not included in Visual C++ 6.0, but are in 7.0+
-#ifndef WM_APPCOMMAND
-#define WM_APPCOMMAND                     0x0319
-#endif
-
-#define FAPPCOMMAND_MASK                  0xF000
-
-#ifndef WM_GETTITLEBARINFOEX
-#define WM_GETTITLEBARINFOEX              0x033F
-#endif
-
-#ifndef CCHILDREN_TITLEBAR
-#define CCHILDREN_TITLEBAR                5
-#endif
-
 #ifndef APPCOMMAND_BROWSER_BACKWARD
   #define APPCOMMAND_BROWSER_BACKWARD       1
   #define APPCOMMAND_BROWSER_FORWARD        2
   #define APPCOMMAND_BROWSER_REFRESH        3
   #define APPCOMMAND_BROWSER_STOP           4
   #define APPCOMMAND_BROWSER_SEARCH         5
   #define APPCOMMAND_BROWSER_FAVORITES      6
   #define APPCOMMAND_BROWSER_HOME           7