From 8a7c290ff7882e4f4eb2f2b64ef93e8dc36e9cbc Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Thu, 6 Jun 2002 10:40:42 +0000 Subject: [PATCH] Add nsIObserver to the ShowPageSetup method for platforms that impl an Apply btn Bug 149317 r=dcone sr=kin git-svn-id: svn://10.0.0.236/trunk@122803 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl | 5 ++++- .../browser/webBrowser/nsIPrintingPromptService.idl | 6 +++++- .../printingui/src/mac/nsPrintingPromptService.cpp | 2 +- .../printingui/src/mac/nsPrintingPromptServiceX.cpp | 2 +- .../printingui/src/os2/nsPrintingPromptService.cpp | 2 +- .../printingui/src/unixshared/nsPrintingPromptService.cpp | 2 +- .../printingui/src/win/nsPrintingPromptService.cpp | 2 +- .../components/windowwatcher/src/nsPrintingPrompt.cpp | 4 ++-- .../xpfe/communicator/resources/content/utilityOverlay.js | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl b/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl index c4469ccc53e..ca273a67e41 100644 --- a/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl +++ b/mozilla/embedding/browser/webBrowser/nsIPrintingPrompt.idl @@ -176,8 +176,11 @@ interface nsIPrintingPrompt : nsISupports * Shows the print progress dialog * * @param printSettings - PrintSettings for page setup (required) + * @param aObs - An observer to know if the contents of the Print Settings + * object has changed while the dialog is being shown. + * For example, some platforms may implement an "Apply" button (not required) */ - void showPageSetup(in nsIPrintSettings printSettings); + void showPageSetup(in nsIPrintSettings printSettings, in nsIObserver aObs); /** * Sometimes platforms need to bring up a special properties dialog for showing diff --git a/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl b/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl index e49bc01395e..3ff6e6d11e2 100644 --- a/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl +++ b/mozilla/embedding/browser/webBrowser/nsIPrintingPromptService.idl @@ -175,9 +175,13 @@ interface nsIPrintingPromptService : nsISupports * * @param parent - a DOM windows the dialog will be parented to (required) * @param printSettings - PrintSettings for page setup (required) + * @param aObs - An observer to know if the contents of the Print Settings + * object has changed while the dialog is being shown. + * For example, some platforms may implement an "Apply" button (not required) */ void showPageSetup(in nsIDOMWindow parent, - in nsIPrintSettings printSettings); + in nsIPrintSettings printSettings, + in nsIObserver aObs); /** * Sometimes platforms need to bring up a special properties dialog for showing diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp index 3ed1fd246cb..8c99caa8ef2 100644 --- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptService.cpp @@ -454,7 +454,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, } NS_IMETHODIMP -nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings) +nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { nsCOMPtr printSettingsMac(do_QueryInterface(printSettings)); if (!printSettingsMac) diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp index c52797d5a57..a2c63958ab9 100644 --- a/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp +++ b/mozilla/embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp @@ -312,7 +312,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, } NS_IMETHODIMP -nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings) +nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { nsCOMPtr printSettingsX(do_QueryInterface(printSettings)); if (!printSettingsX) diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp index 2881f91f079..6cc70941b22 100644 --- a/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp @@ -182,7 +182,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, /* void showPageSetup (in nsIDOMWindow parent, in nsIPrintSettings printSettings); */ NS_IMETHODIMP -nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings) +nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { NS_ENSURE_ARG(printSettings); diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp index a2af56112c7..9ab066dfdc8 100644 --- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintingPromptService.cpp @@ -177,7 +177,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, /* void showPageSetup (in nsIDOMWindow parent, in nsIPrintSettings printSettings); */ NS_IMETHODIMP -nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings) +nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { NS_ENSURE_ARG(printSettings); diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp index eee5218ac41..1839484d21f 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintingPromptService.cpp @@ -238,7 +238,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent, /* void showPageSetup (in nsIDOMWindow parent, in nsIPrintSettings printSettings); */ NS_IMETHODIMP -nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings) +nsPrintingPromptService::ShowPageSetup(nsIDOMWindow *parent, nsIPrintSettings *printSettings, nsIObserver *aObs) { NS_ENSURE_ARG(printSettings); diff --git a/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp b/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp index cbacf23f11b..e0b85924b40 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsPrintingPrompt.cpp @@ -98,9 +98,9 @@ nsPrintingPrompt::ShowProgress(nsIWebBrowserPrint *webBrowserPrint, nsIPrintSett /* void showPageSetup (in nsIPrintSettings printSettings); */ NS_IMETHODIMP -nsPrintingPrompt::ShowPageSetup(nsIPrintSettings *printSettings) +nsPrintingPrompt::ShowPageSetup(nsIPrintSettings *printSettings, nsIObserver *aObs) { - return mPromptService->ShowPageSetup(mParent, printSettings); + return mPromptService->ShowPageSetup(mParent, printSettings, aObs); } /* void showPrinterProperties (in wstring printerName, in nsIPrintSettings printSettings); */ diff --git a/mozilla/xpfe/communicator/resources/content/utilityOverlay.js b/mozilla/xpfe/communicator/resources/content/utilityOverlay.js index 30dd7c6da94..0031bfdf0b1 100644 --- a/mozilla/xpfe/communicator/resources/content/utilityOverlay.js +++ b/mozilla/xpfe/communicator/resources/content/utilityOverlay.js @@ -137,7 +137,7 @@ function goPageSetup(domwin, printSettings) // the ShowPrintSetupDialog method. var printingPromptService = Components.classes["@mozilla.org/embedcomp/printingprompt-service;1"] .getService(Components.interfaces.nsIPrintingPromptService); - printingPromptService.showPageSetup(domwin, printSettings); + printingPromptService.showPageSetup(domwin, printSettings, null); return true; } catch(e) { return false;