From 2ac5cc45f1f5b0e8dee2ebea6df1a84c49bf7628 Mon Sep 17 00:00:00 2001 From: "davidm%netscape.com" Date: Thu, 2 Sep 1999 00:18:54 +0000 Subject: [PATCH] Update to support dialog titles and more than 2 buttons git-svn-id: svn://10.0.0.236/trunk@45587 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp | 12 ++++++------ mozilla/xpfe/appshell/src/nsWebShellWindow.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp b/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp index a0adba77714..7c451becd7b 100644 --- a/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp +++ b/mozilla/xpfe/appshell/src/nsNetSupportDialog.cpp @@ -349,7 +349,7 @@ NS_IMETHODIMP nsNetSupportDialog::Alert( const nsString &aText ) rv = nsComponentManager::CreateInstance( kCommonDialogsCID,0, nsICommonDialogs::GetIID(), (void**)&dialogService ); if( NS_SUCCEEDED ( rv ) ) - rv = dialogService->Alert( window, text ); + rv = dialogService->Alert( window, NULL, text ); } return rv; @@ -382,7 +382,7 @@ NS_IMETHODIMP nsNetSupportDialog::Confirm( const nsString &aText, PRInt32* retur rv = nsComponentManager::CreateInstance( kCommonDialogsCID,0, nsICommonDialogs::GetIID(), (void**)&dialogService ); if( NS_SUCCEEDED ( rv ) ) - rv = dialogService->Confirm( window, text, returnValue ); + rv = dialogService->Confirm( window, NULL, text, returnValue ); } return rv; @@ -418,7 +418,7 @@ NS_IMETHODIMP nsNetSupportDialog::ConfirmCheck( const nsString &aText, const nsS rv = nsComponentManager::CreateInstance( kCommonDialogsCID,0, nsICommonDialogs::GetIID(), (void**)&dialogService ); if( NS_SUCCEEDED ( rv ) ) - rv = dialogService->ConfirmCheck( window, text, checkMsg, checkValue, returnValue ); + rv = dialogService->ConfirmCheck( window,NULL, text, checkMsg, checkValue, returnValue ); } return rv; @@ -498,7 +498,7 @@ NS_IMETHODIMP nsNetSupportDialog::Prompt( const nsString &aText, const nsString rv = nsComponentManager::CreateInstance( kCommonDialogsCID,0, nsICommonDialogs::GetIID(), (void**)&dialogService ); if( NS_SUCCEEDED ( rv ) ) - rv = dialogService->Prompt( window, text, defaultText, resultText, returnValue ); + rv = dialogService->Prompt( window, NULL, text, defaultText, resultText, returnValue ); } return rv; @@ -543,7 +543,7 @@ NS_IMETHODIMP nsNetSupportDialog::PromptUserAndPassword( const nsString &aText, rv = nsComponentManager::CreateInstance( kCommonDialogsCID,0, nsICommonDialogs::GetIID(), (void**)&dialogService ); if( NS_SUCCEEDED ( rv ) ) - rv = dialogService->PromptUsernameAndPassword( window, text, user, pwd, returnValue ); + rv = dialogService->PromptUsernameAndPassword( window, NULL,text, user, pwd, returnValue ); } return rv; @@ -587,7 +587,7 @@ NS_IMETHODIMP nsNetSupportDialog::PromptPassword( const nsString &aText, rv = nsComponentManager::CreateInstance( kCommonDialogsCID,0, nsICommonDialogs::GetIID(), (void**)&dialogService ); if( NS_SUCCEEDED ( rv ) ) - rv = dialogService->PromptPassword( window, text, pwd, returnValue ); + rv = dialogService->PromptPassword( window, NULL,text, pwd, returnValue ); } return rv; diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index a8171dc8783..ce6ec330ddd 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -2920,7 +2920,7 @@ NS_IMETHODIMP nsWebShellWindow::Alert(const PRUnichar *text) NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv); if ( NS_SUCCEEDED( rv ) ) - rv = dialog->Alert( domWindow, text ); + rv = dialog->Alert( domWindow, NULL,text ); return rv; } @@ -2939,7 +2939,7 @@ NS_IMETHODIMP nsWebShellWindow::Confirm(const PRUnichar *text, PRBool *_retval) NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv); if ( NS_SUCCEEDED( rv ) ) - rv = dialog->Confirm( domWindow, text, _retval ); + rv = dialog->Confirm( domWindow, NULL, text, _retval ); return rv; } @@ -2958,7 +2958,7 @@ NS_IMETHODIMP nsWebShellWindow::ConfirmCheck(const PRUnichar *text, const PRUnic NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv); if ( NS_SUCCEEDED( rv ) ) - rv =dialog->ConfirmCheck( domWindow, text, checkMsg, checkValue, _retval ); + rv =dialog->ConfirmCheck( domWindow,NULL, text, checkMsg, checkValue, _retval ); return rv; } @@ -2977,7 +2977,7 @@ NS_IMETHODIMP nsWebShellWindow::Prompt(const PRUnichar *text, const PRUnichar *d NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv); if ( NS_SUCCEEDED( rv ) ) - rv = dialog->Prompt( domWindow, text, defaultText, result, _retval ); + rv = dialog->Prompt( domWindow, NULL, text, defaultText, result, _retval ); return rv; } @@ -2996,7 +2996,7 @@ NS_IMETHODIMP nsWebShellWindow::PromptUsernameAndPassword(const PRUnichar *text, NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv); if ( NS_SUCCEEDED( rv ) ) - rv = dialog->PromptUsernameAndPassword( domWindow, text, user, pwd, _retval ); + rv = dialog->PromptUsernameAndPassword( domWindow, NULL, text, user, pwd, _retval ); return rv; } @@ -3015,7 +3015,7 @@ NS_IMETHODIMP nsWebShellWindow::PromptPassword(const PRUnichar *text, PRUnichar NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv); if ( NS_SUCCEEDED( rv ) ) - rv = dialog->PromptPassword( domWindow, text, pwd, _retval ); + rv = dialog->PromptPassword( domWindow, NULL, text, pwd, _retval ); return rv; }