Bug 320988 relanding activex bits with a fix for the agressive optimization of inlines, r=darin

widget/public/nsIPrintOptions.idl

@@ -41,7 +41,7 @@
 #include "nsIPrintSettings.idl"
 
 %{ C++
-#include "nsFont.h"
+struct nsFont;
 %}
 
 interface nsISimpleEnumerator;
@@ -49,8 +49,7 @@ interface nsISimpleEnumerator;
 /**
  * Native types
  */
-  [ref] native nsNativeFontRef(nsFont);
-  [ref] native nsNativeStringRef(nsString);
+[ref] native nsNativeFontRef(nsFont);
 
 /**
  * Print options interface

widget/src/xpwidgets/nsPrintOptionsImpl.h

@@ -45,6 +45,8 @@
 #include "nsIPrintOptions.h"
 #include "nsIPrintSettingsService.h"
 #include "nsIPrefBranch.h"
+#include "nsString.h"
+#include "nsFont.h"
 
 #undef  IMETHOD_VISIBILITY
 #define IMETHOD_VISIBILITY NS_VISIBILITY_DEFAULT