ソースを参照

Update to Scintilla 4.0.0.

Martijn Laan 1 年間 前
コミット
3975459294

+ 2 - 1
Components/ScintEdit.pas

@@ -316,7 +316,7 @@ type
       write SetAutoCompleteFontName;
     property AutoCompleteFontSize: Integer read FAutoCompleteFontSize
       write SetAutoCompleteFontSize default 0;
-    property CodePage: Integer read FCodePage write SetCodePage default 0;
+    property CodePage: Integer read FCodePage write SetCodePage default CP_UTF8;
     property Color;
     property FillSelectionToEdge: Boolean read FFillSelectionToEdge write SetFillSelectionToEdge
       default False;
@@ -476,6 +476,7 @@ const
 constructor TScintEdit.Create(AOwner: TComponent);
 begin
   inherited;
+  FCodePage := CP_UTF8;
   FLines := TScintEditStrings.Create;
   FLines.FEdit := Self;
   FTabWidth := 8;

+ 6 - 3
Components/ScintInt.pas

@@ -1,7 +1,7 @@
 unit ScintInt;
 
 {
-  Delphi translation of Scintilla.h from Scintilla 3.7.5
+  Delphi translation of Scintilla.h from Scintilla 4.0.0
   created by Jordan Russell and updated by Martijn Laan
 }
 
@@ -539,8 +539,6 @@ const
   SCI_SETVSCROLLBAR = 2280;
   SCI_GETVSCROLLBAR = 2281;
   SCI_APPENDTEXT = 2282;
-  SCI_GETTWOPHASEDRAW = 2283;
-  SCI_SETTWOPHASEDRAW = 2284;
   SC_PHASES_ONE = 0;
   SC_PHASES_TWO = 1;
   SC_PHASES_MULTIPLE = 2;
@@ -978,6 +976,10 @@ const
   SCI_SETIDENTIFIERS = 4024;
   SCI_DISTANCETOSECONDARYSTYLES = 4025;
   SCI_GETSUBSTYLEBASES = 4026;
+  SCI_GETNAMEDSTYLES = 4029;
+  SCI_NAMEOFSTYLE = 4030;
+  SCI_TAGSOFSTYLE = 4031;
+  SCI_DESCRIPTIONOFSTYLE = 4032;
   SC_MOD_INSERTTEXT = $1;
   SC_MOD_DELETETEXT = $2;
   SC_MOD_CHANGESTYLE = $4;
@@ -1070,6 +1072,7 @@ const
   SCN_FOCUSOUT = 2029;
   SCN_AUTOCCOMPLETED = 2030;
   SCN_MARGINRIGHTCLICK = 2031;
+  SCN_AUTOCSELECTIONCHANGE = 2032;
 
 type
   TSci_Position = Integer;

BIN
Files/isscint.dll


+ 0 - 1
Projects/Src/CompForm.pas

@@ -671,7 +671,6 @@ begin
   Memo.Align := alClient;
   Memo.AutoCompleteFontName := Font.Name;
   Memo.AutoCompleteFontSize := Font.Size;
-  Memo.CodePage := CP_UTF8;
   Memo.Font.Name := 'Courier New';
   Memo.Font.Size := 10;
   Memo.ShowHint := True;

+ 0 - 1
Projects/Src/CompScintEdit.pas

@@ -148,7 +148,6 @@ begin
     -3.6.6: Investigate SCFIND_CXX11REGEX: C++ 11 <regex> support built by default.
             Can be disabled by defining NO_CXX11_REGEX. Good (?) overview at:
             https://cplusplus.com/reference/regex/ECMAScript/
-    -4.0.0: Investigate: "The default encoding in Scintilla is UTF-8."
     -5.0.1: Review using SCI_INDICSETSTROKEWIDTH for high DPI support on INDIC_SQUIGGLE }
 
   Call(SCI_SETCARETWIDTH, 2, 0);