Changeset 74 for trunk/IDE/UCore.pas

Timestamp:

Jan 18, 2018, 11:54:13 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 1.8.0.

File:

• trunk/IDE/UCore.pas (modified) (4 diffs)

trunk/IDE/UCore.pas

@@ -35 +35 @@
     DebugLog1: TDebugLog;
     LastOpenedFiles: TLastOpenedList;
+    ModuleManager1: TModuleManager;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -68 +69 @@
 
 uses
-  UFormMain, UProjectTemplates, UIDEModulePascal, UModulePascal, UModuleGCC;
+  UFormMain, UProjectTemplates, UIDEModulePascal, UModulePascal, UModuleGCC,
+  UModuleInterpretter, UModuleDelphi, UModulePHP, UModuleJava, UModuleASM8051;
 
 { TCore }
@@ -116 +118 @@
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
-  ModuleManager.Free;
-  ProjectTemplates.Free;
-  LastOpenedFiles.Free;
-  TargetProject.Free;
-  Project.Free;
-  Compiler.Free;
+  FreeAndNil(ModuleManager);
+  FreeAndNil(ProjectTemplates);
+  FreeAndNil(LastOpenedFiles);
+  FreeAndNil(TargetProject);
+  FreeAndNil(Project);
+  FreeAndNil(Compiler);
 end;
 
@@ -213 +215 @@
     RegisterModule(TModulePascal.Create(nil));
     RegisterModule(TModuleGCC.Create(nil));
-{    RegisterModule(TModuleInterpretter.Create);
-    RegisterModule(TModuleDelphi.Create);
-    RegisterModule(TModulePHP.Create);
-    RegisterModule(TModuleJava.Create);
-    RegisterModule(TModuleASM8051.Create);
-    RegisterModule(TModuleXML.Create);
-    RegisterModule(TModuleNASM.Create);}
+    RegisterModule(TModuleInterpretter.Create(nil));
+    RegisterModule(TModuleDelphi.Create(nil));
+    RegisterModule(TModulePHP.Create(nil));
+    RegisterModule(TModuleJava.Create(nil));
+    RegisterModule(TModuleASM8051.Create(nil));
+    //RegisterModule(TModuleXML.Create(nil));
+    //RegisterModule(TModuleNASM.Create(nil));
+    Modules.Perform(maEnable);
+    Modules.Perform(maStart);
   end;
 end;