corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds a new arg to the PP call. The new arg is not being used, it is

Browse Source 
for future and is needed for the API freeze.
Bug 144716 r=dcone sr=attinasi
This commit is contained in:
rods@netscape.com
2002-05-16 13:51:54 +00:00
parent 712b354488
commit e75912cf4e
7 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
content/base/src/nsDocumentViewer.cpp
View File

@@ -6345,6 +6345,7 @@ void DocumentViewerImpl::CheckForHiddenFrameSetFrames()
*/
NS_IMETHODIMP
DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings,
nsIDOMWindow *aChildDOMWin,
nsIWebProgressListener* aWebProgressListener)
{
if (!mPresShell) {
@@ -8324,6 +8325,15 @@ DocumentViewerImpl::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSet
return NS_OK;
}
/* readonly attribute nsIDOMWindow currentChildDOMWindow; */
NS_IMETHODIMP
DocumentViewerImpl::GetCurrentChildDOMWindow(nsIDOMWindow * *aCurrentChildDOMWindow)
{
NS_ENSURE_ARG_POINTER(aCurrentChildDOMWindow);
*aCurrentChildDOMWindow = nsnull;
return NS_ERROR_NOT_IMPLEMENTED;
}
/* void cancel (); */
NS_IMETHODIMP
DocumentViewerImpl::Cancel()

14
embedding/browser/webBrowser/nsIWebBrowserPrint.idl
View File

@@ -63,6 +63,18 @@ interface nsIWebBrowserPrint : nsISupports
*/
readonly attribute nsIPrintSettings currentPrintSettings;
/**
* Returns a pointer to the current child DOMWindow
* that is being print previewed. (FrameSet Frames)
*
* Returns null if parent document is not a frameset or the entire FrameSet
* document is being print previewed
*
* This enables any consumers of the interface to have access
* to the "current" child DOMWindow at later points in the execution
*/
readonly attribute nsIDOMWindow currentChildDOMWindow;
/**
* Returns whether it is in Print mode
*/
@@ -114,10 +126,12 @@ interface nsIWebBrowserPrint : nsISupports
*
* aThePrintOptions - Printer Settings for the print preview, if aThePrintSettings is null
* then the global PS will be used.
* aChildDOMWin - DOM Window of the child document to be PP (FrameSet frames)
* nsIWebProgressListener - is updated during the printpreview
* @return void
*/
void printPreview(in nsIPrintSettings aThePrintSettings,
in nsIDOMWindow aChildDOMWin,
in nsIWebProgressListener aWPListener);
/**

2
embedding/tests/mfcembed/BrowserView.cpp
View File

@@ -1019,7 +1019,7 @@ void CBrowserView::OnFilePrintPreview()
}
if (!m_InPrintPreview)
{
if (NS_SUCCEEDED(print->PrintPreview(m_PrintSettings, nsnull)))
if (NS_SUCCEEDED(print->PrintPreview(m_PrintSettings, nsnull, nsnull)))
{
m_InPrintPreview = TRUE;

10
layout/base/nsDocumentViewer.cpp
View File

@@ -6345,6 +6345,7 @@ void DocumentViewerImpl::CheckForHiddenFrameSetFrames()
*/
NS_IMETHODIMP
DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings,
nsIDOMWindow *aChildDOMWin,
nsIWebProgressListener* aWebProgressListener)
{
if (!mPresShell) {
@@ -8324,6 +8325,15 @@ DocumentViewerImpl::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSet
return NS_OK;
}
/* readonly attribute nsIDOMWindow currentChildDOMWindow; */
NS_IMETHODIMP
DocumentViewerImpl::GetCurrentChildDOMWindow(nsIDOMWindow * *aCurrentChildDOMWindow)
{
NS_ENSURE_ARG_POINTER(aCurrentChildDOMWindow);
*aCurrentChildDOMWindow = nsnull;
return NS_ERROR_NOT_IMPLEMENTED;
}
/* void cancel (); */
NS_IMETHODIMP
DocumentViewerImpl::Cancel()

8
modules/plugin/base/src/nsPluginViewer.cpp
View File

@@ -853,6 +853,7 @@ PluginViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetting
/* void printPreview (in nsIPrintSettings aThePrintSettings); */
NS_IMETHODIMP
PluginViewerImpl::PrintPreview(nsIPrintSettings *aThePrintSettings,
nsIDOMWindow *aChildDOMWin,
nsIWebProgressListener* aWebProgressListener)
{
return NS_ERROR_NOT_IMPLEMENTED;
@@ -886,6 +887,13 @@ PluginViewerImpl::GetCurrentPrintSettings(nsIPrintSettings * *aCurrentPrintSetti
return NS_ERROR_NOT_IMPLEMENTED;
}
/* readonly attribute nsIDOMWindow currentChildDOMWindow; */
NS_IMETHODIMP
PluginViewerImpl::GetCurrentChildDOMWindow(nsIDOMWindow * *aCurrentChildDOMWindow)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/* void cancel (); */
NS_IMETHODIMP
PluginViewerImpl::Cancel()

4
xpfe/browser/resources/content/browser.js
View File

@@ -252,7 +252,7 @@ function BrowserPrintPreview()
Components.interfaces.nsIWebBrowserPrint);
if (webBrowserPrint) {
gPrintSettings = GetPrintSettings();
webBrowserPrint.printPreview(gPrintSettings, null);
webBrowserPrint.printPreview(gPrintSettings, null, null);
}
// show the toolbar after we go into print preview mode so
@@ -289,7 +289,7 @@ function BrowserPrintSetup()
psService.savePrintSettingsToPrefs(gPrintSettings, false, gPrintSettings.kInitSaveNativeData);
}
if (webBrowserPrint.doingPrintPreview) {
webBrowserPrint.printPreview(gPrintSettings, null);
webBrowserPrint.printPreview(gPrintSettings, null, null);
}
}
}

6
xpfe/communicator/resources/content/printPreviewBindings.xml
View File

@@ -327,7 +327,7 @@
if (aValue == "ShrinkToFit") {
if (!settings.shrinkToFit) {
settings.shrinkToFit = true;
print.printPreview(settings, null);
print.printPreview(settings, null, null);
this.mScaleCombobox.setAttribute('lastValidInx', this.mScaleCombobox.selectedIndex);
// update total number of pages since this could have changed
this.mTotalPages.value = print.printPreviewNumPages;
@@ -353,7 +353,7 @@
settings.shrinkToFit = false;
settings.scaling = aValue;
print.printPreview(settings, null);
print.printPreview(settings, null, null);
// update total number of pages since this could have changed
this.mTotalPages.value = print.printPreviewNumPages;
]]>
@@ -384,7 +384,7 @@
var print = this._getWebBrowserPrint();
var settings = print.currentPrintSettings;
settings.orientation = orientValue;
print.printPreview(settings, null);
print.printPreview(settings, null, null);
// update total number of pages since this could have changed
this.mTotalPages.value = print.printPreviewNumPages;