From 5c2d4bcedd9fadbb5ce707f2357620d9ef63f36f Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Tue, 7 Feb 2006 01:11:47 +0000
Subject: [PATCH] #45797 - fix consumers of NS_IMPL_ISUPPORTS r=dveditz

---
 widget/src/windows/nsDeviceContextSpecFactoryW.cpp | 5 +----
 widget/src/windows/nsDeviceContextSpecWin.cpp      | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/widget/src/windows/nsDeviceContextSpecFactoryW.cpp b/widget/src/windows/nsDeviceContextSpecFactoryW.cpp
index c6313a94c713..6be1a20d3afc 100644
--- a/widget/src/windows/nsDeviceContextSpecFactoryW.cpp
+++ b/widget/src/windows/nsDeviceContextSpecFactoryW.cpp
@@ -36,13 +36,10 @@ nsDeviceContextSpecFactoryWin :: ~nsDeviceContextSpecFactoryWin()
 {
 }
 
-static NS_DEFINE_IID(kDeviceContextSpecFactoryIID, NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID);
 static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
 static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID);
 
-NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecFactoryWin, kDeviceContextSpecFactoryIID)
-NS_IMPL_ADDREF(nsDeviceContextSpecFactoryWin)
-NS_IMPL_RELEASE(nsDeviceContextSpecFactoryWin)
+NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryWin, nsIDeviceContextSpecFactory)
 
 NS_IMETHODIMP nsDeviceContextSpecFactoryWin :: Init(void)
 {
diff --git a/widget/src/windows/nsDeviceContextSpecWin.cpp b/widget/src/windows/nsDeviceContextSpecWin.cpp
index 8a063fa10206..7d70e22d8b65 100644
--- a/widget/src/windows/nsDeviceContextSpecWin.cpp
+++ b/widget/src/windows/nsDeviceContextSpecWin.cpp
@@ -54,11 +54,7 @@ nsDeviceContextSpecWin :: ~nsDeviceContextSpecWin()
   }
 }
 
-static NS_DEFINE_IID(kDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID);
-
-NS_IMPL_QUERY_INTERFACE(nsDeviceContextSpecWin, kDeviceContextSpecIID)
-NS_IMPL_ADDREF(nsDeviceContextSpecWin)
-NS_IMPL_RELEASE(nsDeviceContextSpecWin)
+NS_IMPL_ISUPPORTS1(nsDeviceContextSpecWin, nsIDeviceContextSpec)
 
 NS_IMETHODIMP nsDeviceContextSpecWin :: Init(char *aDriverName, char *aDeviceName, HGLOBAL aDEVMODE)
 {