Bug 306370, Print orientation and other Mac page setup things aren't remembered. Update prototypes and initialize print settings from prefs. r=mano sr=smfr

widget/src/mac/nsPrintOptionsX.cpp

@@ -75,9 +75,13 @@ nsresult nsPrintOptionsX::_CreatePrintSettings(nsIPrintSettings **_retval)
   NS_ADDREF(*_retval = printSettings); // ref count
 
   rv = printSettings->Init();
-  if (NS_FAILED(rv))
+  if (NS_FAILED(rv)) {
     NS_RELEASE(*_retval);
+    return rv;
+  }
 
+  (void)InitPrintSettingsFromPrefs(*_retval, PR_FALSE,
+                                   nsIPrintSettings::kInitSaveAll);
   return rv;
 }
 
@@ -102,11 +106,11 @@ nsPrintOptionsX::GetNativeData(PRInt16 aDataType, void * *_retval)
 #pragma mark -
 
 nsresult
-nsPrintOptionsX::ReadPrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRUint32 aFlags)
+nsPrintOptionsX::ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags)
 {
   nsresult rv;
   
-  rv = nsPrintOptions::ReadPrefs(aPS, aPrefName, aFlags);
+  rv = nsPrintOptions::ReadPrefs(aPS, aPrinterName, aFlags);
   NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintOptions::ReadPrefs() failed");
   
   nsCOMPtr<nsIPrintSettingsX> printSettingsX(do_QueryInterface(aPS));
@@ -119,11 +123,11 @@ nsPrintOptionsX::ReadPrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRU
 }
 
 nsresult
-nsPrintOptionsX::WritePrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRUint32 aFlags)
+nsPrintOptionsX::WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, PRUint32 aFlags)
 {
   nsresult rv;
   
-  rv = nsPrintOptions::WritePrefs(aPS, aPrefName, aFlags);
+  rv = nsPrintOptions::WritePrefs(aPS, aPrinterName, aFlags);
   NS_ASSERTION(NS_SUCCEEDED(rv), "nsPrintOptions::WritePrefs() failed");
   
   nsCOMPtr<nsIPrintSettingsX> printSettingsX(do_QueryInterface(aPS));

widget/src/mac/nsPrintOptionsX.h

@@ -1,67 +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):
- *   Simon Fraser <sfraser@netscape.com>
- *
- * 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 nsPrintOptionsX_h__
-#define nsPrintOptionsX_h__
-
-#include "nsPrintOptionsImpl.h"
-
-
-//*****************************************************************************
-//***    nsPrintOptions
-//*****************************************************************************
-
-class nsPrintOptionsX : public nsPrintOptions
-{
-public:
-              nsPrintOptionsX();
-  virtual     ~nsPrintOptionsX();
-
-  NS_IMETHOD  ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings);
-  
-  NS_IMETHOD  GetNativeData(PRInt16 aDataType, void * *_retval);
-
-protected:
-  nsresult    _CreatePrintSettings(nsIPrintSettings **_retval);
-
-  nsresult    ReadPrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRUint32 aFlags);
-  nsresult    WritePrefs(nsIPrintSettings* aPS, const nsString& aPrefName, PRUint32 aFlags);
-};
-
-
-#endif /* nsPrintOptionsX_h__ */