From b55fe91d34fea8eafd9d031e7fefcb8f6403a63e Mon Sep 17 00:00:00 2001
From: "reed%reedloden.com"
 <reed%reedloden.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 27 Jan 2009 22:56:32 +0000
Subject: [PATCH] Bug 462441 - "Windows 7 default OS theme not recognized by
 windows-default-theme metric" [r=robarnold sr=roc a=dveditz]

git-svn-id: svn://10.0.0.236/trunk@255940 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/windows/nsLookAndFeel.cpp | 2 +-
 mozilla/widget/src/windows/nsWindow.h        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/widget/src/windows/nsLookAndFeel.cpp b/mozilla/widget/src/windows/nsLookAndFeel.cpp
index c35e9df76ed..ca6183b61ec 100644
--- a/mozilla/widget/src/windows/nsLookAndFeel.cpp
+++ b/mozilla/widget/src/windows/nsLookAndFeel.cpp
@@ -562,7 +562,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
           // users a handful of clock cycles by skipping checks for the
           // 5.x themes (or vice-versa), we can use a single loop for all
           // the different Windows versions.
-          if (hresult == S_OK && GetWindowsVersion() <= VISTA_VERSION) {
+          if (hresult == S_OK && GetWindowsVersion() <= WIN7_VERSION) {
             LPCWSTR defThemes[] = {
               L"luna.msstyles",
               L"royale.msstyles",
diff --git a/mozilla/widget/src/windows/nsWindow.h b/mozilla/widget/src/windows/nsWindow.h
index 979543de893..aaf92fdc87f 100644
--- a/mozilla/widget/src/windows/nsWindow.h
+++ b/mozilla/widget/src/windows/nsWindow.h
@@ -87,6 +87,7 @@ struct nsFakeCharMessage;
 #define WINXP_VERSION   0x501
 #define WIN2K3_VERSION  0x502
 #define VISTA_VERSION   0x600
+#define WIN7_VERSION    0x601
 
 PRInt32 GetWindowsVersion();