paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-06 14:39:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed Escape key in dialogs: run params, new, compiler opts

Browse Source 
git-svn-id: trunk@6643 -
This commit is contained in:
mattias 2005-01-20 11:37:24 +00:00
parent 4f73c82aaf
commit d98fb2e07c
4 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/compileroptionsdlg.pp
View File

@ -231,7 +231,6 @@ type
btnLoadSave: TButton; btnLoadSave: TButton;
procedure ButtonOKClicked(Sender: TObject); procedure ButtonOKClicked(Sender: TObject);
procedure ButtonCancelClicked(Sender: TObject);
procedure ButtonCheckClicked(Sender: TObject); procedure ButtonCheckClicked(Sender: TObject);
procedure ButtonLoadSaveClick(Sender: TObject); procedure ButtonLoadSaveClick(Sender: TObject);
procedure ButtonShowOptionsClicked(Sender: TObject); procedure ButtonShowOptionsClicked(Sender: TObject);
@ -433,17 +432,6 @@ begin
ModalResult:=mrOk; ModalResult:=mrOk;
end; end;
{------------------------------------------------------------------------------}
{ TfrmCompilerOptions ButtonCancelClicked }
{------------------------------------------------------------------------------}
procedure TfrmCompilerOptions.ButtonCancelClicked(Sender: TObject);
begin
// Cancel any changes
Assert(False, 'Trace:Cancel compiler options changes');
ModalResult:=mrCancel;
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
TfrmCompilerOptions ButtonCheckClicked TfrmCompilerOptions ButtonCheckClicked
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
@ -2641,8 +2629,9 @@ begin
begin begin
Parent := Self; Parent := Self;
Caption := dlgCancel; Caption := dlgCancel;
OnClick := @ButtonCancelClicked; ModalResult := mrCancel;
end; end;
CancelControl:=btnCancel;
btnShowOptions := TButton.Create(Self); btnShowOptions := TButton.Create(Self);
with btnShowOptions do with btnShowOptions do

9
ide/newdialog.pas
View File

@ -131,7 +131,6 @@ type
DescriptionLabel: TLabel; DescriptionLabel: TLabel;
OkButton: TButton; OkButton: TButton;
CancelButton: TButton; CancelButton: TButton;
procedure CancelButtonClick(Sender: TObject);
procedure ItemsTreeViewClick(Sender: TObject); procedure ItemsTreeViewClick(Sender: TObject);
procedure NewOtherDialogResize(Sender: TObject); procedure NewOtherDialogResize(Sender: TObject);
procedure OkButtonClick(Sender: TObject); procedure OkButtonClick(Sender: TObject);
@ -231,11 +230,6 @@ begin
ItemsTreeView.EndUpdate; ItemsTreeView.EndUpdate;
end; end;
procedure TNewOtherDialog.CancelButtonClick(Sender: TObject);
begin
ModalResult:=mrCancel;
end;
procedure TNewOtherDialog.ItemsTreeViewClick(Sender: TObject); procedure TNewOtherDialog.ItemsTreeViewClick(Sender: TObject);
var var
Desc: String; Desc: String;
@ -299,8 +293,9 @@ begin
Left:=150; Left:=150;
Top:=100; Top:=100;
Caption:=dlgCancel; Caption:=dlgCancel;
OnClick:=@CancelButtonClick; ModalResult := mrCancel;
end; end;
CancelControl:=CancelButton;
end; end;
constructor TNewOtherDialog.Create(TheOwner: TComponent); constructor TNewOtherDialog.Create(TheOwner: TComponent);

16
ide/project.pp
View File

@ -2278,12 +2278,13 @@ begin
if not fPathDelimChanged then begin if not fPathDelimChanged then begin
FileWasAbsolute:=FilenameIsAbsolute(AFileName); FileWasAbsolute:=FilenameIsAbsolute(AFileName);
end else begin end else begin
if PathDelim='\' then {$IFDEF Win32}
// PathDelim changed from '/' to '\' // PathDelim changed from '/' to '\'
FileWasAbsolute:=FilenameIsUnixAbsolute(AFileName) FileWasAbsolute:=FilenameIsUnixAbsolute(AFileName)
else {$ELSE}
// PathDelim changed from '\' to '/' // PathDelim changed from '\' to '/'
FileWasAbsolute:=FilenameIsWinAbsolute(AFileName); FileWasAbsolute:=FilenameIsWinAbsolute(AFileName);
{$ENDIF}
DoDirSeparators(AFilename); DoDirSeparators(AFilename);
end; end;
AFilename:=TrimFilename(AFilename); AFilename:=TrimFilename(AFilename);
@ -3169,6 +3170,9 @@ end.
{ {
$Log$ $Log$
Revision 1.178 2005/01/20 11:37:24 mattias
fixed Escape key in dialogs: run params, new, compiler opts
Revision 1.177 2005/01/15 13:44:03 vincents Revision 1.177 2005/01/15 13:44:03 vincents
use xml units from fpc, if not compiling with fpc 1.0 use xml units from fpc, if not compiling with fpc 1.0

11
ide/runparamsopts.pas
View File

@ -134,7 +134,6 @@ type
OkButton: TButton; OkButton: TButton;
CancelButton: TButton; CancelButton: TButton;
procedure OkButtonClick(Sender: TObject); procedure OkButtonClick(Sender: TObject);
procedure CancelButtonClick(Sender: TObject);
procedure HostApplicationBrowseBtnClick(Sender: TObject); procedure HostApplicationBrowseBtnClick(Sender: TObject);
procedure RunParamsOptsDlgResize(Sender: TObject); procedure RunParamsOptsDlgResize(Sender: TObject);
procedure UserOverridesGroupBoxResize(Sender: TObject); procedure UserOverridesGroupBoxResize(Sender: TObject);
@ -357,7 +356,6 @@ begin
SetBounds(270,Self.ClientHeight-40,100,25); SetBounds(270,Self.ClientHeight-40,100,25);
Caption:='Ok'; Caption:='Ok';
OnClick:=@OkButtonClick; OnClick:=@OkButtonClick;
Visible:=true;
end; end;
CancelButton:=TButton.Create(Self); CancelButton:=TButton.Create(Self);
@ -366,9 +364,9 @@ begin
Parent:=Self; Parent:=Self;
SetBounds(390,OkButton.Top,100,25); SetBounds(390,OkButton.Top,100,25);
Caption:=dlgCancel; Caption:=dlgCancel;
OnClick:=@CancelButtonClick; ModalResult := mrCancel;
Visible:=true;
end; end;
CancelControl:=CancelButton;
end; end;
RunParamsOptsDlgResize(nil); RunParamsOptsDlgResize(nil);
end; end;
@ -751,11 +749,6 @@ begin
ModalResult:=mrOk; ModalResult:=mrOk;
end; end;
procedure TRunParamsOptsDlg.CancelButtonClick(Sender: TObject);
begin
ModalResult:=mrCancel;
end;
procedure TRunParamsOptsDlg.HostApplicationBrowseBtnClick(Sender: TObject); procedure TRunParamsOptsDlg.HostApplicationBrowseBtnClick(Sender: TObject);
var OpenDialog: TOpenDialog; var OpenDialog: TOpenDialog;
begin begin