Bug 313309 part 2 - change the NS_DEFINE_STATIC_IID_ACCESSOR macro to NS_DECLARE, and make a NS_DEFINE_ macro that's outside the class declaration, r=shaver

widget/public/nsIDeviceContextSpec.h

@@ -47,7 +47,10 @@
 class nsIDeviceContextSpec : public nsISupports
 {
 public:
-   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_IID)
+   NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDEVICE_CONTEXT_SPEC_IID)
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(nsIDeviceContextSpec,
+                              NS_IDEVICE_CONTEXT_SPEC_IID)
+
 #endif

widget/public/nsIDeviceContextSpecFactory.h

@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIDeviceContextSpecFactory_h___
-#define nsIDeviceContextSpecFactory_h___
-
-#include "nsISupports.h"
-
-class nsIDeviceContextSpec;
-class nsIWidget;
-class nsIPrintSettings;
-
-#define NS_IDEVICE_CONTEXT_SPEC_FACTORY_IID   \
-{ 0xf6669570, 0x7b3d, 0x11d2, \
-{ 0xa8, 0x48, 0x00, 0x40, 0x95, 0x9a, 0x28, 0xc9 } }
-
-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
-   */
-  NS_IMETHOD Init(void) = 0;
-
-  /**
-   * Get a device context specification. Typically, this
-   * means getting information about a printer. A previously
-   * returned device context spec can be passed in and used as
-   * a starting point for getting a new spec (or simply returning
-   * the old spec again). 
-   * @param aWidget.. this is a widget a dialog can be hosted in
-   * @param aNewSpec out parameter for device context spec returned. the
-   *        aOldSpec may be returned if the object is recyclable.
-   * @param aIsPrintPreview if PR_TRUE, creating Spec for PrintPreview
-   * @return error status
-   */
-  NS_IMETHOD CreateDeviceContextSpec(nsIWidget *aWidget,
-                                     nsIPrintSettings* aPrintSettings,
-                                     nsIDeviceContextSpec *&aNewSpec,
-                                     PRBool aIsPrintPreview) = 0;
-};
-
-#endif