paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-15 20:19:50 +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;

21
lcl/include/messagedialogs.inc
View File

@ -30,7 +30,7 @@
- User ability to customize Button order
}
function ModalEscapeValue(Buttons : TMsgDlgButtons) : TModalResult;
function ModalEscapeValue(Buttons: TMsgDlgButtons): TModalResult;
begin
If mbCancel in Buttons then
Result := mrCancel
@ -62,7 +62,7 @@ begin
If mbYesToAll in Buttons then
Result := mrYesToAll
else
Result:=mrCancel;
Result := mrCancel;
end;
function ModalDefaultButton(Buttons : TMsgDlgButtons) : TMsgDlgbtn;
@ -98,10 +98,11 @@ begin
else
If mbIgnore in Buttons then
Result := mbIgnore
else begin
for b:=Low(TMsgDlgBtn) to High(TMsgDlgBtn) do
else
begin
for b := Low(TMsgDlgBtn) to High(TMsgDlgBtn) do
if b in Buttons then
Result:=b;
Result := b;
end;
end;
@ -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);
idButtonIgnore, idButtonYes, idButtonNo, idButtonAll, idButtonNoToAll,
idButtonYesToAll, idButtonClose);
function GetPromptUserButtons(Buttons: TMsgDlgButtons; var CancelValue,
DefaultIndex, ButtonCount : Longint; UseDefButton: Boolean; DefButton: TMsgDlgBtn) : PLongint;
@ -143,7 +144,7 @@ begin
begin
if CurBtn in Buttons then
begin
ReallocMem(Result, (ButtonCount + 1)*SizeOf(Longint));
ReallocMem(Result, (ButtonCount + 1) * SizeOf(Longint));
Result[ButtonCount] := ButtonIds[CurBtn];
if DefaultButton = CurBtn then
DefaultIndex := ButtonCount;