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

TBitBtn with Kind=bkClose: close also non-modal form if ModalResult in [mrNone,mrClose]. Fixes issue #21942

Browse Source 
git-svn-id: trunk@37299 -
This commit is contained in:
bart 2012-05-17 07:02:32 +00:00
parent 2834c6ab2a
commit 5d26cd2459
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/include/bitbtn.inc
View File

@ -48,13 +48,23 @@ procedure TCustomBitBtn.Click;
var
Form : TCustomForm;
begin
//Contrary to other buttons with ModalResult = mrNone
//a TBitBtn must close ParentForm if Kind = bkClose
if (FKind = bkClose) and (ModalResult = mrNone) then begin
{ A TBitBtn with Kind = bkClose should
- Close the ParentForm if ModalResult = mrNone.
It should not set ParentForm.ModalResult in this case
- Close a non-modal ParentForm if ModalResult in [mrNone, mrClose]
- In all other cases it should behave like any other TBitBtn
}
if (FKind = bkClose) then
begin
Form := GetParentForm(Self);
if Form <> nil then begin
Form.Close;
exit;
if (Form <> nil) then
begin
if (ModalResult = mrNone) or
((ModalResult = mrClose) and not (fsModal in Form.FormState)) then
begin
Form.Close;
Exit;
end;
end;
end;
inherited Click;