mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

remove still-compiled classic code from print ui (bug 267763) r+sr=darin

This commit is contained in:
joshmoz%gmail.com 2004-11-04 21:26:34 +00:00
Родитель 9a9da97694
Коммит 2100b1ea0d
1 изменённых файлов: 3 добавлений и 46 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

49
embedding/components/printingui/src/mac/nsPrintingPromptServiceX.cpp
Просмотреть файл

@ -62,7 +62,6 @@
// OS includes
#include <PMApplication.h>
#include <CFPlugIn.h>
#include <Gestalt.h>
// Constants
static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul";
@ -256,46 +255,7 @@ nsPrintingPromptService::ShowProgress(nsIDOMWindow* parent,
nsIPrintProgressParams** printProgressParams,
PRBool* notifyOnOpen)
{
NS_ENSURE_ARG(webProgressListener);
NS_ENSURE_ARG(printProgressParams);
NS_ENSURE_ARG(notifyOnOpen);
*notifyOnOpen = PR_FALSE;
// If running on OS X, the printing manager displays a nice progress dialog
// so we don't need to do this. Keeping this code here in order to support
// running TARGET_CARBON builds on OS 9.
long version;
if (::Gestalt(gestaltSystemVersion, &version) == noErr && version >= 0x00001000)
return NS_ERROR_NOT_IMPLEMENTED;
nsPrintProgress* prtProgress = new nsPrintProgress();
nsresult rv = prtProgress->QueryInterface(NS_GET_IID(nsIPrintProgress), (void**)getter_AddRefs(mPrintProgress));
NS_ENSURE_SUCCESS(rv, rv);
rv = prtProgress->QueryInterface(NS_GET_IID(nsIWebProgressListener), (void**)getter_AddRefs(mWebProgressListener));
NS_ENSURE_SUCCESS(rv, rv);
nsPrintProgressParams* prtProgressParams = new nsPrintProgressParams();
rv = prtProgressParams->QueryInterface(NS_GET_IID(nsIPrintProgressParams), (void**)printProgressParams);
NS_ENSURE_SUCCESS(rv, rv);
if (printProgressParams)
{
if (mWatcher)
{
nsCOMPtr<nsIDOMWindow> active;
mWatcher->GetActiveWindow(getter_AddRefs(active));
nsCOMPtr<nsIDOMWindowInternal> parent(do_QueryInterface(active));
mPrintProgress->OpenProgressDialog(parent, kPrintProgressDialogURL, *printProgressParams, openDialogObserver, notifyOnOpen);
}
}
*webProgressListener = NS_STATIC_CAST(nsIWebProgressListener*, this);
NS_ADDREF(*webProgressListener);
return rv;
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
@ -352,13 +312,10 @@ nsPrintingPromptService::ShowPrinterProperties(nsIDOMWindow *parent, const PRUni
NS_IMETHODIMP
nsPrintingPromptService::OnStateChange(nsIWebProgress *aWebProgress, nsIRequest *aRequest, PRUint32 aStateFlags, nsresult aStatus)
{
if ((aStateFlags & STATE_STOP) && mWebProgressListener)
{
if ((aStateFlags & STATE_STOP) && mWebProgressListener) {
mWebProgressListener->OnStateChange(aWebProgress, aRequest, aStateFlags, aStatus);
if (mPrintProgress)
{
mPrintProgress->CloseProgressDialog(PR_TRUE);
}
mPrintProgress->CloseProgressDialog(PR_TRUE);
mPrintProgress = nsnull;
mWebProgressListener = nsnull;
}