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

MG: fixed setting modalresult on hide

Browse Source 
git-svn-id: trunk@3533 -
This commit is contained in:
lazarus 2002-10-22 13:01:20 +00:00
parent 4502e5b28f
commit 17b5d70d0b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ide/compileroptions.pp
View File

@ -42,7 +42,8 @@ interface
uses
Forms, Classes, SysUtils, ComCtrls, Buttons, StdCtrls, ExtCtrls, LazConf,
Laz_XMLCfg, FileCtrl, Dialogs, Controls, PathEditorDlg, IDEProcs, LazarusIDEStrConsts;
Laz_XMLCfg, FileCtrl, Dialogs, Controls, PathEditorDlg, IDEProcs,
LazarusIDEStrConsts;
type
{ Compiler Options object used to hold the compiler options }
@ -3079,8 +3080,10 @@ var AButton: TPathEditorButton;
begin
if Sender is TPathEditorButton then begin
AButton:=TPathEditorButton(Sender);
writeln('TfrmCompilerOptions.PathEditBtnExecuted ',TComponent(Sender).Name,':',Sender.ClassName,' ',AButton.CurrentPathEditor.ModalResult);
if AButton.CurrentPathEditor.ModalResult<>mrOk then exit;
NewPath:=AButton.CurrentPathEditor.Path;
writeln('TfrmCompilerOptions.PathEditBtnExecuted ',TComponent(Sender).Name,':',Sender.ClassName,' ',NewPath);
if AButton=OtherUnitsPathEditBtn then begin
edtOtherUnits.Text:=NewPath;
end else

17
lcl/include/customform.inc
View File

@ -874,7 +874,8 @@ end;
{------------------------------------------------------------------------------}
procedure TCustomForm.Hide;
begin
If fsModal in FormState then
If (fsModal in FormState)
and (ModalResult=0) then
ModalResult := mrCancel;
Visible := False;
end;
@ -892,8 +893,8 @@ end;
{------------------------------------------------------------------------------}
function TCustomForm.IsForm: Boolean;
begin
//TODO:
Result := True;
//TODO:
Result := True;
end;
{------------------------------------------------------------------------------}
@ -1103,11 +1104,12 @@ begin
InterfaceObject.HandleEvents; // process all events
if Application.FTerminate then
ModalResult := mrCancel
else if ModalResult <> 0 then
else if ModalResult <> 0 then begin
CloseModal;
if ModalResult<>0 then break;
if ModalResult<>0 then break;
end;
Application.Idle;
until ModalResult <> 0;
until false;
Result := ModalResult;
if GetActiveWindow <> Handle then ActiveWindow := 0;
@ -1135,6 +1137,9 @@ end;
{ =============================================================================
$Log$
Revision 1.62 2002/10/22 13:01:20 lazarus
MG: fixed setting modalresult on hide
Revision 1.61 2002/10/06 17:55:45 lazarus
MG: JITForms now sets csDesigning before creation