Sfoglia il codice sorgente

designer: do not warn if Fresnel already in uses section

mattias 5 mesi fa
parent
commit
994ad6a769
2 ha cambiato i file con 7 aggiunte e 4 eliminazioni
  1. 0 1
      demo/lcl/Edit/editdemo.lpr
  2. 7 3
      design/fresnel.register.pas

+ 0 - 1
demo/lcl/Edit/editdemo.lpr

@@ -7,7 +7,6 @@ uses
   Forms,
   Interfaces,
   Fresnel,
-//  Fresnel.lcl,
   frmedit,
   frmhost;
 

+ 7 - 3
design/fresnel.register.pas

@@ -538,6 +538,7 @@ var
   MainFilename: String;
   Code: TCodeBuffer;
   DependencyOwner: TObject;
+  NamePos, InPos: integer;
 begin
   Result:=inherited Initialized(NewFile);
   aProject:=LazarusIDE.ActiveProject;
@@ -551,13 +552,16 @@ begin
   end;
   if PackageEditingInterface.IsOwnerDependingOnPkg(aProject,'LCL',DependencyOwner) then
   begin
-    // a lcl app -> add FresnelLCL behind 'interfaces'
+    // a lcl app -> add Fresnel behind 'interfaces'
     MainFilename:=aProject.MainFile.Filename;
     Code:=CodeToolBoss.LoadFile(MainFilename,true,false);
     if not CodeToolBoss.AddUnitToMainUsesSectionIfNeeded(Code,'Fresnel','',[aufLast]) then
     begin
-      debugln(['Warning: TFileDescFresnelForm.Initialized: failed adding uses Fresnel to "',MainFilename,'"']);
-      exit;
+      if CodeToolBoss.FindUnitInAllUsesSections(Code,'Fresnel',NamePos,InPos) then
+      begin
+        debugln(['Warning: TFileDescFresnelForm.Initialized: failed adding uses Fresnel to "',MainFilename,'"']);
+        exit;
+      end;
     end;
   end;
 end;