diff --git a/extensions/wallet/src/singsign.cpp b/extensions/wallet/src/singsign.cpp index 0882ad9fa5a..cb8720a6ecb 100644 --- a/extensions/wallet/src/singsign.cpp +++ b/extensions/wallet/src/singsign.cpp @@ -141,7 +141,10 @@ si_SelectDialog(const PRUnichar* szMessage, char** pList, PRInt32* pCount) { nsCOMPtr prompter(do_QueryInterface(webshellwindow)); PRInt32 selectedIndex; PRBool rtnValue; +#ifdef XP_MAC +#else rv = prompter->Select( NULL, szMessage, *pCount, (const char **)pList, &selectedIndex, &rtnValue ); +#end *pCount = selectedIndex; si_UserHasBeenSelected = PR_TRUE; return rtnValue; diff --git a/xpfe/appshell/src/nsNetSupportDialog.cpp b/xpfe/appshell/src/nsNetSupportDialog.cpp index 489c8d2fd92..31d813fd466 100644 --- a/xpfe/appshell/src/nsNetSupportDialog.cpp +++ b/xpfe/appshell/src/nsNetSupportDialog.cpp @@ -550,6 +550,8 @@ NS_IMETHODIMP nsNetSupportDialog::PromptPassword(const PRUnichar *text, #endif } +#ifdef XP_MAC +#else nsresult nsNetSupportDialog::Select(const PRUnichar *inDialogTitle, const PRUnichar *inMsg, PRUint32 inCount, const char **inList, PRInt32 *outSelection, PRBool *_retval) { nsresult rv; @@ -565,7 +567,7 @@ nsresult nsNetSupportDialog::Select(const PRUnichar *inDialogTitle, const PRUnic *outSelection = selectedIndex; return rv; } - +#endif nsresult nsNetSupportDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) { diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index 1963808716c..1c1ddab7a1b 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -3034,6 +3034,8 @@ NS_IMETHODIMP nsWebShellWindow::ConfirmCheckYN(const PRUnichar *text, const PRUn return NS_ERROR_NOT_IMPLEMENTED; } +#ifdef XP_MAC +#else NS_IMETHODIMP nsWebShellWindow::Select( const PRUnichar *inDialogTitle, const PRUnichar* inMsg, PRUint32 inCount, const char **inList, PRInt32 *outSelection, PRBool *_retval) { nsresult rv; @@ -3052,6 +3054,7 @@ NS_IMETHODIMP nsWebShellWindow::Select( const PRUnichar *inDialogTitle, const PR rv = dialog->Select(domWindow, inDialogTitle, inMsg, inCount,inList, outSelection, _retval); return rv; } +#endif NS_IMETHODIMP nsWebShellWindow::Alert(const char *url, const PRUnichar *title, const PRUnichar *text) {