QuestionDlg: fix wrong ModalResult if dialog has buttons with both mrCancel and mrAbort as ModalResult (issue #0026094).

git-svn-id: trunk@44852 -
This commit is contained in:
bart 2014-04-30 12:56:23 +00:00
parent bac9fc0689
commit 258a876b50

View File

@ -923,7 +923,7 @@ begin
end;
if DialogButtons.DefaultButton = nil then
DialogButtons.DefaultButton := DialogButtons.FindButton([mrYes, mrOk, mrYesToAll, mrAll, mrRetry, mrCancel, mrNo, mrNoToAll, mrAbort, mrIgnore]);
DialogButtons.CancelButton := DialogButtons.FindButton([mrAbort, mrCancel, mrNo, mrIgnore, mrNoToAll, mrYes, mrOk, mrRetry, mrAll, mrYesToAll]);
DialogButtons.CancelButton := DialogButtons.FindButton([mrCancel, mrAbort, mrNo, mrIgnore, mrNoToAll, mrYes, mrOk, mrRetry, mrAll, mrYesToAll]);
Result := WidgetSet.AskUser(aCaption, aMsg, DialogIds[DlgType], DialogButtons, HelpCtx);
finally
DialogButtons.Free;