Changeset 58 for branches/ByteArray/Forms/FormSourceEditor.pas

Timestamp:

Nov 23, 2023, 11:18:42 PM (13 months ago)

Author:

chronos

Message:

• Modified: Source editor with main menu can't be docked into another form with main menu. Source enditor and Screen have own main menu.

File:

• branches/ByteArray/Forms/FormSourceEditor.pas (modified) (6 diffs)

branches/ByteArray/Forms/FormSourceEditor.pas

@@ -39 +39 @@
     MenuItem16: TMenuItem;
     MenuItem17: TMenuItem;
+    MenuItem18: TMenuItem;
+    MenuItem19: TMenuItem;
     MenuItem2: TMenuItem;
+    MenuItem20: TMenuItem;
+    MenuItem21: TMenuItem;
+    MenuItem22: TMenuItem;
+    MenuItem23: TMenuItem;
+    MenuItem24: TMenuItem;
+    MenuItem25: TMenuItem;
+    MenuItem26: TMenuItem;
+    MenuItem27: TMenuItem;
+    MenuItem28: TMenuItem;
+    MenuItem29: TMenuItem;
+    Separator3: TMenuItem;
+    Separator2: TMenuItem;
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
@@ -53 +67 @@
     procedure ACloseExecute(Sender: TObject);
     procedure ACompileExecute(Sender: TObject);
-    procedure AExitExecute(Sender: TObject);
     procedure ANewExecute(Sender: TObject);
     procedure AOpenExecute(Sender: TObject);
@@ -60 +73 @@
     procedure ASaveExecute(Sender: TObject);
     procedure AStopExecute(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -77 +91 @@
 implementation
 
+{$R *.lfm}
+
 uses
-  Common;
-
-{$R *.lfm}
+  Common, Core;
 
 { TFormSourceEditor }
@@ -91 +105 @@
   FormAssembler := TFormAssembler.Create(nil);
   FormMessages.OnSelect := FormAssembler.Select;
-end;
-
-procedure TFormSourceEditor.AExitExecute(Sender: TObject);
-begin
-  Close;
 end;
 
@@ -165 +174 @@
 end;
 
+procedure TFormSourceEditor.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+  if Core.Core.MainForm = Self then Application.Terminate;
+end;
+
 procedure TFormSourceEditor.FormDestroy(Sender: TObject);
 begin