Make most "btnCancelClick" procedures superflous by assigning the correct ModalResult (mrCancel) to the relevant cancel buttons.

source/connections.dfm

@@ -3018,8 +3018,8 @@ object connform: Tconnform
     Anchors = [akRight, akBottom]
     Cancel = True
     Caption = 'Cancel'
+    ModalResult = 2
     TabOrder = 10
-    OnClick = ButtonCancelClick
   end
   object ButtonConnect: TButton
     Tag = 15

source/connections.pas

@@ -46,7 +46,6 @@ type
     procedure FormCreate(Sender: TObject);
     procedure ButtonSaveAndConnectClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure ButtonCancelClick(Sender: TObject);
     procedure ButtonConnectClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ButtonSaveClick(Sender: TObject);
@@ -96,13 +95,6 @@ begin
 end;
 
 
-// Cancel
-procedure Tconnform.ButtonCancelClick(Sender: TObject);
-begin
-  close;
-end;
-
-
 // Connect
 procedure Tconnform.ButtonConnectClick(Sender: TObject);
 var

source/copytable.dfm

@@ -94,7 +94,6 @@ object CopyTableForm: TCopyTableForm
     Caption = 'Cancel'
     ModalResult = 2
     TabOrder = 5
-    OnClick = ButtonCancelClick
   end
   object CheckBoxWithIndexes: TCheckBox
     Left = 16

source/copytable.pas

@@ -31,7 +31,6 @@ type
     procedure editNewTablenameChange(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ButtonOKClick(Sender: TObject);
-    procedure ButtonCancelClick(Sender: TObject);
   private
     { Private declarations }
     oldTableName : String;
@@ -308,9 +307,4 @@ begin
 
 end;
 
-procedure TCopyTableForm.ButtonCancelClick(Sender: TObject);
-begin
-  close;
-end;
-
 end.

source/edituser.dfm

@@ -27,7 +27,6 @@ object FormEditUser: TFormEditUser
     Caption = 'Cancel'
     ModalResult = 2
     TabOrder = 0
-    OnClick = Button1Click
   end
   object Button2: TButton
     Left = 154

source/edituser.pas

@@ -19,7 +19,6 @@ type
     EditHost: TEdit;
     EditPassword1: TEdit;
     EditPassword2: TEdit;
-    procedure Button1Click(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Button2Click(Sender: TObject);
   private
@@ -52,11 +51,6 @@ begin
 end;
 
 
-procedure TFormEditUser.Button1Click(Sender: TObject);
-begin
-  close;
-end;
-
 procedure TFormEditUser.FormShow(Sender: TObject);
 begin
   EditUsername.Text := UserManagerForm.user;

source/exportsql.dfm

@@ -49,8 +49,8 @@ object ExportSQLForm: TExportSQLForm
     Anchors = [akRight, akBottom]
     Cancel = True
     Caption = 'Cancel'
+    ModalResult = 2
     TabOrder = 1
-    OnClick = btnCancelClick
   end
   object barProgress: TProgressBar
     Left = 3

source/exportsql.pas

@@ -79,7 +79,6 @@ type
     procedure comboDatabaseChange(Sender: TObject);
     procedure cbxTablesClick(Sender: TObject);
     procedure cbxDatabaseClick(Sender: TObject);
-    procedure btnCancelClick(Sender: TObject);
     procedure btnDirectoryBrowseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure comboSelectDatabaseChange(Sender: TObject);
@@ -170,10 +169,6 @@ begin
   btnDirectoryBrowse.PngImage := Mainform.PngImageListMain.PngImages[51].PngImage;
 end;
 
-procedure TExportSQLForm.btnCancelClick(Sender: TObject);
-begin
-  close;
-end;
 
 procedure TExportSQLForm.FormShow(Sender: TObject);
 var

source/insertfiles_progress.dfm

@@ -73,6 +73,7 @@ object frmInsertFilesProgress: TfrmInsertFilesProgress
     Width = 75
     Height = 25
     Caption = 'Cancel'
+    ModalResult = 2
     TabOrder = 1
     OnClick = Button1Click
   end

source/insertfiles_progress.pas

@@ -40,7 +40,6 @@ uses main, childwin, helpers,insertfiles,
 procedure TfrmInsertFilesProgress.Button1Click(Sender: TObject);
 begin
   canceled := true;
-  close;
 end;
 
 procedure TfrmInsertFilesProgress.ProcessFiles(Sender: TObject);

source/loaddata.dfm

@@ -44,7 +44,6 @@ object loaddataform: Tloaddataform
     Caption = 'Cancel'
     ModalResult = 2
     TabOrder = 1
-    OnClick = btnCancelClick
   end
   object PageControlMain: TPageControl
     Left = 0

source/loaddata.pas

@@ -53,7 +53,6 @@ type
     lblIgnoreLines: TLabel;
     procedure FormCreate(Sender: TObject);
     procedure editFilenameChange(Sender: TObject);
-    procedure btnCancelClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure comboDatabaseChange(Sender: TObject);
     procedure comboTableChange(Sender: TObject);
@@ -104,11 +103,6 @@ begin
   btnColDown.PngImage := Mainform.PngImageListMain.PngImages[75].PngImage;
 end;
 
-procedure Tloaddataform.btnCancelClick(Sender: TObject);
-begin
-  close;
-end;
-
 procedure Tloaddataform.FormShow(Sender: TObject);
 var
   tn : TTreeNode;

source/optimizetables.dfm

@@ -58,8 +58,8 @@ object optimize: Toptimize
     Cancel = True
     Caption = 'Close'
     Default = True
+    ModalResult = 2
     TabOrder = 12
-    OnClick = Button3Click
   end
   object CheckBoxQuickRepair: TCheckBox
     Left = 360

source/optimizetables.pas

@@ -31,7 +31,6 @@ type
     ToolButton2: TToolButton;
     cbxExtendedCheck: TCheckBox;
     cbxExtendedRepair: TCheckBox;
-    procedure Button3Click(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure DBComboBoxChange(Sender: TObject);
     procedure CheckListToggle(Sender: TObject);
@@ -67,11 +66,6 @@ begin
   FreeAndNil (f);
 end;
 
-procedure Toptimize.Button3Click(Sender: TObject);
-begin
-  close;
-end;
-
 procedure Toptimize.FormShow(Sender: TObject);
 var
   i : Integer;

source/usermanager.dfm

@@ -497,8 +497,8 @@ object UserManagerForm: TUserManagerForm
       Anchors = [akTop, akRight]
       Cancel = True
       Caption = 'Close'
+      ModalResult = 2
       TabOrder = 0
-      OnClick = ButtonCloseClick
     end
     object ButtonAddUser: TButton
       Left = 368

source/usermanager.pas

@@ -63,7 +63,6 @@ type
     Button1: TButton;
     procedure DBUserTreeExpanding(Sender: TObject; Node: TTreeNode;
       var AllowExpansion: Boolean);
-    procedure ButtonCloseClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure CheckBoxAllPrivilegesClick(Sender: TObject);
     procedure ButtonAddUserClick(Sender: TObject);
@@ -160,12 +159,6 @@ begin
   end;
 end;
 
-procedure TUserManagerForm.ButtonCloseClick(Sender: TObject);
-begin
-  close;
-end;
-
-
 procedure TUserManagerForm.FormShow(Sender: TObject);
 var
   i        : Integer;