summaryrefslogtreecommitdiff
path: root/widget
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-19 09:58:44 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-19 09:58:44 +0100
commit85edb1c711f7816ed1a30edd07b37d314fac216a (patch)
tree814487cc06993dd6e133ab4b23e5bc16b6cb5e2d /widget
parentbc9ad467f0886f8799c2c4781b1a0b654b362ecf (diff)
downloaduxp-85edb1c711f7816ed1a30edd07b37d314fac216a.tar.gz
Make the proper Windows APIs natively available to our tree.
Tag #22. This bypasses custom definitions of some functions for things natively available in Windows 7.
Diffstat (limited to 'widget')
-rw-r--r--widget/windows/TaskbarPreview.cpp2
-rw-r--r--widget/windows/WinUtils.cpp2
-rw-r--r--widget/windows/nsLookAndFeel.h2
-rw-r--r--widget/windows/nsWinGesture.h2
4 files changed, 6 insertions, 2 deletions
diff --git a/widget/windows/TaskbarPreview.cpp b/widget/windows/TaskbarPreview.cpp
index c897af0212..6c15df2e0b 100644
--- a/widget/windows/TaskbarPreview.cpp
+++ b/widget/windows/TaskbarPreview.cpp
@@ -28,7 +28,9 @@
#include "mozilla/Telemetry.h"
// Defined in dwmapi in a header that needs a higher numbered _WINNT #define
+#ifndef DWM_SIT_DISPLAYFRAME
#define DWM_SIT_DISPLAYFRAME 0x1
+#endif
namespace mozilla {
namespace widget {
diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
index 418a77182b..0a57ad4393 100644
--- a/widget/windows/WinUtils.cpp
+++ b/widget/windows/WinUtils.cpp
@@ -601,7 +601,7 @@ WinUtils::SystemScaleFactor()
return systemScale;
}
-#ifndef WM_DPICHANGED
+#if WINVER < 0x603
typedef enum {
MDT_EFFECTIVE_DPI = 0,
MDT_ANGULAR_DPI = 1,
diff --git a/widget/windows/nsLookAndFeel.h b/widget/windows/nsLookAndFeel.h
index 6200541f5f..e3a2d5a7b7 100644
--- a/widget/windows/nsLookAndFeel.h
+++ b/widget/windows/nsLookAndFeel.h
@@ -28,6 +28,8 @@
#ifndef SM_SYSTEMDOCKED
#define SM_CONVERTIBLESLATEMODE 0x00002003
#define SM_SYSTEMDOCKED 0x00002004
+#endif
+#if WINVER < 0x0601
typedef enum _AR_STATE
{
AR_ENABLED = 0x0,
diff --git a/widget/windows/nsWinGesture.h b/widget/windows/nsWinGesture.h
index 24c1f6b2d8..f5561166a0 100644
--- a/widget/windows/nsWinGesture.h
+++ b/widget/windows/nsWinGesture.h
@@ -18,7 +18,7 @@
#include "mozilla/TouchEvents.h"
// Desktop builds target apis for 502. Win8 Metro builds target 602.
-#if WINVER < 0x0602
+#if WINVER < 0x0601
DECLARE_HANDLE(HGESTUREINFO);