Browse Source

Add IsscintInt unit as cleanup.

Martijn Laan 1 year ago
parent
commit
af4dd730b0

+ 1 - 4
Components/ScintEdit.pas

@@ -480,7 +480,7 @@ type
 implementation
 
 uses
-  ShellAPI, RTLConsts, UITypes, GraphUtil;
+  ShellAPI, RTLConsts, UITypes, GraphUtil, IsscintInt;
 
 { TScintEdit }
 
@@ -2010,9 +2010,6 @@ var
     SetStyleAttr(StyleNumber, Attr, False);
   end;
 
-const
-  { Note: This style is specific to our patched build }
-  STYLE_AUTOCOMPLETION = 40;
 var
   I: Integer;
 begin

+ 2 - 1
Projects/Compil32.dpr

@@ -59,7 +59,8 @@ uses
   TaskDialog in 'Src\TaskDialog.pas',
   CompRegistryDesigner in 'Src\CompRegistryDesigner.pas' {RegistryDesignerForm},
   CompWizardRegistryHelper in 'Src\CompWizardRegistryHelper.pas',
-  MD5 in 'Src\MD5.pas';
+  MD5 in 'Src\MD5.pas',
+  IsscintInt in 'Src\IsscintInt.pas';
 
 {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
 {$SETPEOSVERSION 6.1}

+ 1 - 0
Projects/Compil32.dproj

@@ -141,6 +141,7 @@
         </DCCReference>
         <DCCReference Include="Src\CompWizardRegistryHelper.pas"/>
         <DCCReference Include="Src\MD5.pas"/>
+        <DCCReference Include="Src\IsscintInt.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

+ 1 - 3
Projects/Src/CompScintEdit.pas

@@ -145,7 +145,7 @@ type
 implementation
 
 uses
-  MD5;
+  MD5, IsscintInt;
   
 { TCompScintEdit }
 
@@ -156,8 +156,6 @@ begin
 end;
 
 procedure TCompScintEdit.CreateWnd;
-const
-  SC_MARK_BACKFORE = 3030;  { new marker type added in Inno Setup's Scintilla build }
 begin
   inherited;
 

+ 21 - 0
Projects/Src/IsscintInt.pas

@@ -0,0 +1,21 @@
+unit IsscintInt;
+
+{
+  Inno Setup
+  Copyright (C) 1997-2024 Jordan Russell
+  Portions by Martijn Laan
+  For conditions of distribution and use, see LICENSE.TXT.
+
+  Constants added in Inno Setup's Scintilla build
+}
+
+interface
+
+const
+  SC_MARK_BACKFORE = 34;
+  STYLE_AUTOCOMPLETION = 40;
+  STYLE_LASTPREDEFINED = 40;
+
+implementation
+
+end.