paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-25 00:11:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Correct handling of non-modal window

Browse Source 
git-svn-id: trunk@58720 -
This commit is contained in:
michael 2018-08-15 17:49:26 +00:00
parent 0f4021f622
commit bc7f4d73ab
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpreport/design/frmfpreportdesignermain.lfm
View File

@ -13,6 +13,7 @@ object FPReportDesignerForm: TFPReportDesignerForm
ClientWidth = 890 ClientWidth = 890
KeyPreview = True KeyPreview = True
Menu = MMReport Menu = MMReport
OnClose = FormClose
OnCloseQuery = FormCloseQuery OnCloseQuery = FormCloseQuery
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy

8
components/fpreport/design/frmfpreportdesignermain.pp
View File

@ -299,6 +299,7 @@ type
procedure AResizeExecute(Sender: TObject); procedure AResizeExecute(Sender: TObject);
procedure ASendToBackExecute(Sender: TObject); procedure ASendToBackExecute(Sender: TObject);
procedure ASendToBackFrontUpdate(Sender: TObject); procedure ASendToBackFrontUpdate(Sender: TObject);
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
procedure FormDestroy(Sender: TObject); procedure FormDestroy(Sender: TObject);
procedure FormDropFiles(Sender: TObject; const FileNames: array of String); procedure FormDropFiles(Sender: TObject; const FileNames: array of String);
@ -1952,6 +1953,13 @@ begin
and (CurrentDesigner.Objects.GetSelection[0].IsPlainElement); and (CurrentDesigner.Objects.GetSelection[0].IsPlainElement);
end; end;
procedure TFPReportDesignerForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
begin
if Not (fsModal in FFormState) then
CloseAction:=caFree;
end;
procedure TFPReportDesignerForm.PCReportChange(Sender: TObject); procedure TFPReportDesignerForm.PCReportChange(Sender: TObject);
begin begin