Interface classes really do need to define |GetIID()|. 5 of these files are just being switched over to the macro. The others were all lacking |GetIID()| implementations.

gfx/public/nsIBlender.h

@@ -34,6 +34,7 @@
 class nsIBlender : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBLENDER_IID)
 
   /**
    * Initialize the Blender

gfx/public/nsIDOMRenderingContext.h

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMRenderingContext_h__
-#define nsIDOMRenderingContext_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-
-
-#define NS_IDOMRENDERINGCONTEXT_IID \
-{ 0x6f7652e0,  0xee43, 0x11d1, \
- { 0x9c, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } } 
-
-class nsIDOMRenderingContext : public nsISupports {
-public:
-
-  NS_IMETHOD    GetColor(nsString& aColor)=0;
-  NS_IMETHOD    SetColor(const nsString& aColor)=0;
-
-  NS_IMETHOD    DrawLine2(PRInt32 aX0, PRInt32 aY0, PRInt32 aX1, PRInt32 aY1)=0;
-};
-
-
-#define NS_DECL_IDOMRENDERINGCONTEXT   \
-  NS_IMETHOD    GetColor(nsString& aColor);  \
-  NS_IMETHOD    SetColor(const nsString& aColor);  \
-  NS_IMETHOD    DrawLine2(PRInt32 aX0, PRInt32 aY0, PRInt32 aX1, PRInt32 aY1);  \
-
-
-
-#define NS_FORWARD_IDOMRENDERINGCONTEXT(_to)  \
-  NS_IMETHOD    GetColor(nsString& aColor) { return _to##GetColor(aColor); } \
-  NS_IMETHOD    SetColor(const nsString& aColor) { return _to##SetColor(aColor); } \
-  NS_IMETHOD    DrawLine2(PRInt32 aX0, PRInt32 aY0, PRInt32 aX1, PRInt32 aY1) { return _to##DrawLine2(aX0, aY0, aX1, aY1); }  \
-
-
-extern nsresult NS_InitRenderingContextClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_GFX nsresult NS_NewScriptRenderingContext(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMRenderingContext_h__

gfx/public/nsIDeviceContext.h

@@ -110,7 +110,7 @@ typedef NI_ColorSpace IL_ColorSpace;
 class nsIDeviceContext : public nsISupports
 {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IDEVICE_CONTEXT_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_IID)
 
   /**
    * Initialize the device context from a widget

gfx/public/nsIDeviceContextSpec.h

@@ -28,6 +28,7 @@
 class nsIDeviceContextSpec : public nsISupports
 {
 public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_IID)
 };
 
 #endif

gfx/public/nsIDeviceContextSpecFactory.h

@@ -30,6 +30,7 @@ class nsIDeviceContextSpec;
 class nsIDeviceContextSpecFactory : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID)
   /**
    * Initialize the device context spec factory
    * @return error status

gfx/public/nsIDrawingSurface.h

@@ -54,6 +54,7 @@ typedef struct
 class nsIDrawingSurface : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAWING_SURFACE_IID)
   /**
    * Lock a rect of a drawing surface and return a
    * pointer to the upper left hand corner of the

gfx/public/nsIFontMetrics.h

@@ -46,7 +46,7 @@ class nsIFontMetrics : public nsISupports
   // XXX what about encoding, where do we put that? MMP
 
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IFONT_METRICS_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONT_METRICS_IID)
 
   /**
    * Initialize the font metrics. Call this after creating the font metrics.

gfx/public/nsIImage.h

@@ -56,6 +56,7 @@ class nsIImage : public nsISupports
 {
 
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IIMAGE_IID)
 
   /**
    * Build and initialize the nsIImage

gfx/public/nsIImageGroup.h

@@ -53,7 +53,7 @@ class nsIURLGroup;
 class nsIImageGroup : public nsISupports
 {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IIMAGEGROUP_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IIMAGEGROUP_IID)
 
   /**
    * Initialize an image group with a device context. All images

gfx/public/nsIImageManager.h

@@ -47,6 +47,8 @@ typedef enum
 class nsIImageManager : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IIMAGEMANAGER_IID)
+
   /// Initialization method to be called before use
   virtual nsresult Init() = 0;
 

gfx/public/nsIImageObserver.h

@@ -106,6 +106,8 @@ typedef enum {
  */
 class nsIImageRequestObserver : public nsISupports {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IIMAGEREQUESTOBSERVER_IID)
+
   /** 
    * Notify the observer of some significant image event. The parameter
    * values depend on the notification type as specified below.
@@ -154,6 +156,8 @@ public:
  */
 class nsIImageGroupObserver : public nsISupports {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IIMAGEGROUPOBSERVER_IID)
+
   /**
    *  Notify the observer of some significant image group event.
    *

gfx/public/nsIImageRequest.h

@@ -39,7 +39,7 @@ class nsIImage;
  */
 class nsIImageRequest : public nsISupports {
 public:  
-  static const nsIID& GetIID() { static nsIID iid = NS_IIMAGEREQUEST_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IIMAGEREQUEST_IID)
 
   /// @return the image object associated with the request.
   virtual nsIImage* GetImage() = 0;

gfx/public/nsIRegion.h

@@ -58,6 +58,8 @@ typedef struct
 class nsIRegion : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IREGION_IID)
+
   virtual nsresult Init(void) = 0;
 
   /**
@@ -244,4 +246,4 @@ public:
   NS_IMETHOD GetRegionComplexity(nsRegionComplexity &aComplexity) const = 0;
 };
 
-#endif  // nsRIegion_h___ 
+#endif  // nsIRegion_h___ 

gfx/public/nsIRenderingContext.h

@@ -69,7 +69,7 @@ typedef void * nsDrawingSurface;
 class nsIRenderingContext : public nsISupports
 {
 public:
-  static const nsIID& GetIID() { static nsIID iid = NS_IRENDERING_CONTEXT_IID; return iid; }
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRENDERING_CONTEXT_IID)
 
   //TBD: bind/unbind, transformation of scalars (hacky), 
   //potential drawmode for selection, polygons. MMP

widget/public/nsIDeviceContextSpec.h

@@ -28,6 +28,7 @@
 class nsIDeviceContextSpec : public nsISupports
 {
 public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_IID)
 };
 
 #endif

widget/public/nsIDeviceContextSpecFactory.h

@@ -30,6 +30,7 @@ class nsIDeviceContextSpec;
 class nsIDeviceContextSpecFactory : public nsISupports
 {
 public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID)
   /**
    * Initialize the device context spec factory
    * @return error status