Bug 1336778 - Part 3a: Remove always-false #if WINVER < 0x0601 (Windows 7) checks in nsLookAndFeel.h. r?jimm draft
authorChris Peterson <cpeterson@mozilla.com>
Mon, 06 Feb 2017 13:25:17 -0800
changeset 479526 40ec7ea07a16bc5468d25a55bbcdc6a013061e84
parent 479523 257f68545b5bb0e7700965f0f51f2453f446f43f
child 479527 23fbe069cb9311b2f275dd740626d70fee1efdce
push id44280
push usercpeterson@mozilla.com
push dateMon, 06 Feb 2017 21:26:50 +0000
reviewersjimm
bugs1336778
milestone54.0a1
Bug 1336778 - Part 3a: Remove always-false #if WINVER < 0x0601 (Windows 7) checks in nsLookAndFeel.h. r?jimm MozReview-Commit-ID: 4ffv8S2LShO
widget/windows/nsLookAndFeel.h
--- a/widget/windows/nsLookAndFeel.h
+++ b/widget/windows/nsLookAndFeel.h
@@ -1,15 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef __nsLookAndFeel
 #define __nsLookAndFeel
+
 #include "nsXPLookAndFeel.h"
 
 /*
  * Gesture System Metrics
  */
 #ifndef SM_DIGITIZER
 #define SM_DIGITIZER         94
 #define TABLET_CONFIG_NONE   0x00000000
@@ -23,30 +24,16 @@
 
 /*
  * Tablet mode detection
  */
 #ifndef SM_SYSTEMDOCKED
 #define SM_CONVERTIBLESLATEMODE 0x00002003
 #define SM_SYSTEMDOCKED         0x00002004
 #endif
-#if WINVER < 0x0601
-typedef enum _AR_STATE
-{
-  AR_ENABLED        = 0x0,
-  AR_DISABLED       = 0x1,
-  AR_SUPPRESSED     = 0x2,
-  AR_REMOTESESSION  = 0x4,
-  AR_MULTIMON       = 0x8,
-  AR_NOSENSOR       = 0x10,
-  AR_NOT_SUPPORTED  = 0x20,
-  AR_DOCKED         = 0x40,
-  AR_LAPTOP         = 0x80
-} AR_STATE, *PAR_STATE;
-#endif
 
 class nsLookAndFeel: public nsXPLookAndFeel {
   static OperatingSystemVersion GetOperatingSystemVersion();
 public:
   nsLookAndFeel();
   virtual ~nsLookAndFeel();
 
   virtual nsresult NativeGetColor(ColorID aID, nscolor &aResult);