зеркало из https://github.com/mozilla/pjs.git
band-aid to fix mac bustage
This commit is contained in:
Родитель
fab6f1bda6
Коммит
d2553d73df
|
@ -141,7 +141,10 @@ si_SelectDialog(const PRUnichar* szMessage, char** pList, PRInt32* pCount) {
|
|||
nsCOMPtr<nsIPrompt> 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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче