From d98fb2e07cbc45ddb574f86d975dcd7e6c5850f5 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Thu, 20 Jan 2005 11:37:24 +0000
Subject: [PATCH] fixed Escape key in dialogs: run params, new, compiler opts

git-svn-id: trunk@6643 -
---
 ide/compileroptionsdlg.pp | 15 ++-------------
 ide/newdialog.pas         |  9 ++-------
 ide/project.pp            | 16 ++++++++++------
 ide/runparamsopts.pas     | 11 ++---------
 4 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp
index 94a600258a..dd17142db2 100644
--- a/ide/compileroptionsdlg.pp
+++ b/ide/compileroptionsdlg.pp
@@ -231,7 +231,6 @@ type
     btnLoadSave: TButton;
 
     procedure ButtonOKClicked(Sender: TObject);
-    procedure ButtonCancelClicked(Sender: TObject);
     procedure ButtonCheckClicked(Sender: TObject);
     procedure ButtonLoadSaveClick(Sender: TObject);
     procedure ButtonShowOptionsClicked(Sender: TObject);
@@ -433,17 +432,6 @@ begin
   ModalResult:=mrOk;
 end;
 
-{------------------------------------------------------------------------------}
-{  TfrmCompilerOptions ButtonCancelClicked                                     }
-{------------------------------------------------------------------------------}
-procedure TfrmCompilerOptions.ButtonCancelClicked(Sender: TObject);
-begin
-  // Cancel any changes
-  Assert(False, 'Trace:Cancel compiler options changes');
-
-  ModalResult:=mrCancel;
-end;
-
 {------------------------------------------------------------------------------
   TfrmCompilerOptions ButtonCheckClicked
 ------------------------------------------------------------------------------}
@@ -2641,8 +2629,9 @@ begin
   begin
     Parent := Self;
     Caption := dlgCancel;
-    OnClick := @ButtonCancelClicked;
+    ModalResult := mrCancel;
   end;
+  CancelControl:=btnCancel;
 
   btnShowOptions := TButton.Create(Self);
   with btnShowOptions do
diff --git a/ide/newdialog.pas b/ide/newdialog.pas
index 9913a091e5..6ff4a24365 100644
--- a/ide/newdialog.pas
+++ b/ide/newdialog.pas
@@ -131,7 +131,6 @@ type
     DescriptionLabel: TLabel;
     OkButton: TButton;
     CancelButton: TButton;
-    procedure CancelButtonClick(Sender: TObject);
     procedure ItemsTreeViewClick(Sender: TObject);
     procedure NewOtherDialogResize(Sender: TObject);
     procedure OkButtonClick(Sender: TObject);
@@ -231,11 +230,6 @@ begin
   ItemsTreeView.EndUpdate;
 end;
 
-procedure TNewOtherDialog.CancelButtonClick(Sender: TObject);
-begin
-  ModalResult:=mrCancel;
-end;
-
 procedure TNewOtherDialog.ItemsTreeViewClick(Sender: TObject);
 var
   Desc: String;
@@ -299,8 +293,9 @@ begin
     Left:=150;
     Top:=100;
     Caption:=dlgCancel;
-    OnClick:=@CancelButtonClick;
+    ModalResult := mrCancel;
   end;
+  CancelControl:=CancelButton;
 end;
 
 constructor TNewOtherDialog.Create(TheOwner: TComponent);
diff --git a/ide/project.pp b/ide/project.pp
index 75e50ad685..e61a446e70 100644
--- a/ide/project.pp
+++ b/ide/project.pp
@@ -2278,12 +2278,13 @@ begin
   if not fPathDelimChanged then begin
     FileWasAbsolute:=FilenameIsAbsolute(AFileName);
   end else begin
-    if PathDelim='\' then
-      // PathDelim changed from '/' to '\'
-      FileWasAbsolute:=FilenameIsUnixAbsolute(AFileName)
-    else
-      // PathDelim changed from '\' to '/'
-      FileWasAbsolute:=FilenameIsWinAbsolute(AFileName);
+    {$IFDEF Win32}
+    // PathDelim changed from '/' to '\'
+    FileWasAbsolute:=FilenameIsUnixAbsolute(AFileName)
+    {$ELSE}
+    // PathDelim changed from '\' to '/'
+    FileWasAbsolute:=FilenameIsWinAbsolute(AFileName);
+    {$ENDIF}
     DoDirSeparators(AFilename);
   end;
   AFilename:=TrimFilename(AFilename);
@@ -3169,6 +3170,9 @@ end.
 
 {
   $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
   use xml units from fpc, if not compiling with fpc 1.0
 
diff --git a/ide/runparamsopts.pas b/ide/runparamsopts.pas
index 24d7f731bc..dd9316d03a 100644
--- a/ide/runparamsopts.pas
+++ b/ide/runparamsopts.pas
@@ -134,7 +134,6 @@ type
     OkButton: TButton;
     CancelButton: TButton;
     procedure OkButtonClick(Sender: TObject);
-    procedure CancelButtonClick(Sender: TObject);
     procedure HostApplicationBrowseBtnClick(Sender: TObject);
     procedure RunParamsOptsDlgResize(Sender: TObject);
     procedure UserOverridesGroupBoxResize(Sender: TObject);
@@ -357,7 +356,6 @@ begin
       SetBounds(270,Self.ClientHeight-40,100,25);
       Caption:='Ok';
       OnClick:=@OkButtonClick;
-      Visible:=true;
     end;
     
     CancelButton:=TButton.Create(Self);
@@ -366,9 +364,9 @@ begin
       Parent:=Self;
       SetBounds(390,OkButton.Top,100,25);
       Caption:=dlgCancel;
-      OnClick:=@CancelButtonClick;
-      Visible:=true;
+      ModalResult := mrCancel;
     end;
+    CancelControl:=CancelButton;
   end;
   RunParamsOptsDlgResize(nil);
 end;
@@ -751,11 +749,6 @@ begin
   ModalResult:=mrOk;
 end;
 
-procedure TRunParamsOptsDlg.CancelButtonClick(Sender: TObject);
-begin
-  ModalResult:=mrCancel;
-end;
-
 procedure TRunParamsOptsDlg.HostApplicationBrowseBtnClick(Sender: TObject);
 var OpenDialog: TOpenDialog;
 begin