paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-16 13:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: add mrClose modal result value, map Help button to mrNone result (issue #0019185)

Browse Source 
git-svn-id: trunk@30376 -
This commit is contained in:
paul 2011-04-19 03:00:14 +00:00
parent 061c206371
commit bd8eb25ea6
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/controls.pp
View File

@ -58,7 +58,8 @@ const
mrAll = mrNone + 8;
mrNoToAll = mrNone + 9;
mrYesToAll = mrNone + 10;
mrLast = mrYesToAll;
mrClose = mrNone + 11;
mrLast = mrClose;
// define aliases for Delphi compatibility
fsSurface = GraphType.fsSurface;

9
lcl/include/messagedialogs.inc
View File

@ -98,7 +98,8 @@ begin
else
If mbIgnore in Buttons then
Result := mbIgnore
else begin
else
begin
for b := Low(TMsgDlgBtn) to High(TMsgDlgBtn) do
if b in Buttons then
Result := b;
@ -115,13 +116,13 @@ const
idButtonClose);
DialogResults : Array[idButtonOK..idButtonNoToAll] of TModalResult = (
mrOk, mrCancel, mrOk{CLOSE!!}, mrYes, mrNo, -1{HELP!!}, mrAbort, mrRetry,
mrOk, mrCancel, mrNone{Help}, mrYes, mrNo, mrClose, mrAbort, mrRetry,
mrIgnore, mrAll, mrYesToAll, mrNoToAll);
ButtonResults : Array[mrNone..mrYesToAll] of Longint = (
ButtonResults : Array[mrNone..mrClose] of Longint = (
-1, idButtonOK, idButtonCancel, idButtonAbort, idButtonRetry,
idButtonIgnore, idButtonYes, idButtonNo, idButtonAll, idButtonNoToAll,
idButtonYesToAll);
idButtonYesToAll, idButtonClose);
function GetPromptUserButtons(Buttons: TMsgDlgButtons; var CancelValue,
DefaultIndex, ButtonCount : Longint; UseDefButton: Boolean; DefButton: TMsgDlgBtn) : PLongint;