зеркало из https://github.com/mozilla/gecko-dev.git
Fix a functionality problem with my previous checkin - change the MacFE stubs for FE_CheckConfirm and FE_SelectDialog to the workaround versions until the actual versions are implemented. Yes the tree is in flames but these files aren't related and folks are all over the problem (akkana and jfrancis have checked in fixes for X and Mac).
This commit is contained in:
Родитель
7d916b93e1
Коммит
b9829e39a5
|
@ -640,7 +640,28 @@ XP_Bool CNSContextCallbacks::SelectDialog(
|
|||
{
|
||||
CNSContext* theNSContext = ExtractNSContext(inContext);
|
||||
Assert_(theNSContext != NULL);
|
||||
return theNSContext->SelectDialog(pMessage, pList, pCount);
|
||||
//return theNSContext->SelectDialog(pMessage, pList, pCount);
|
||||
|
||||
// Temporary stub version until the real MacFE version is implemented
|
||||
int16 i;
|
||||
char *message = 0;
|
||||
for (i = 0; i < *pCount; i++)
|
||||
{
|
||||
StrAllocCopy(message, pMessage);
|
||||
StrAllocCat(message, " = ");
|
||||
StrAllocCat(message, pList[i]);
|
||||
if (theNSContext->Confirm(message))
|
||||
{
|
||||
/* user selected this one */
|
||||
XP_FREE(message);
|
||||
*pCount = i;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
/* user rejected all */
|
||||
XP_FREE(message);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
char* CNSContextCallbacks::Prompt(
|
||||
|
|
|
@ -653,7 +653,10 @@ Boolean UStdDialogs::CheckConfirm(
|
|||
LWindow* inOverWindow,
|
||||
LCommander* inSuper)
|
||||
{
|
||||
return false;
|
||||
// temporary UI until FE implements this function as a single dialog box
|
||||
Boolean userHasAccepted = AskOkCancel(pConfirmMessage);
|
||||
*pChecked = (XP_Bool)AskOkCancel(pCheckMessage);
|
||||
return userHasAccepted;
|
||||
}
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче