SynEdit, Cleanup: Removed unused unit dependencies / changed some var-param into out-param

git-svn-id: trunk@19222 -
This commit is contained in:
martin 2009-04-04 21:23:53 +00:00
parent 85faebfd2b
commit 9c3c06ecf8
34 changed files with 88 additions and 95 deletions

View File

@ -44,7 +44,7 @@ unit SynBeautifierPas;
interface interface
uses uses
Classes, SysUtils, LCLProc, SynEdit, SynBeautifier, SynEditTextBuffer, Classes, SysUtils, LCLProc, SynEdit, SynBeautifier,
SynEditHighlighter, SynHighlighterPas, SynEditTextBase; SynEditHighlighter, SynHighlighterPas, SynEditTextBase;
type type

View File

@ -42,8 +42,7 @@ interface
uses uses
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
LCLProc, LCLIntf, LCLType, SynEditTextBuffer, Messages, LMessages, LCLProc, LCLIntf, LCLType, SynEditMiscProcs,
SynEditMiscProcs,
{$ELSE} {$ELSE}
Windows, SynEditTypes, Messages, Windows, SynEditTypes, Messages,
{$ENDIF} {$ENDIF}

View File

@ -65,7 +65,7 @@ uses
{$IFDEF USE_UTF8BIDI_LCL} {$IFDEF USE_UTF8BIDI_LCL}
FreeBIDI, utf8bidi, FreeBIDI, utf8bidi,
{$ENDIF} {$ENDIF}
Types, FPCAdds, LCLIntf, LCLType, LMessages, LCLProc, Types, LCLIntf, LCLType, LMessages, LCLProc,
{$ELSE} {$ELSE}
Windows, Windows,
{$ENDIF} {$ENDIF}

View File

@ -31,7 +31,7 @@ interface
uses uses
LCLProc, Graphics, LCLProc, Graphics,
Classes, SysUtils, SynEditTypes, SynEditTextBuffer, SynEditTextBase, Classes, SysUtils, SynEditTextBase,
SynEditMiscClasses, SynEditMiscProcs, SynEditPointClasses, SynEditMiscClasses, SynEditMiscProcs, SynEditPointClasses,
SynEditHighlighter, SynEditHighlighterFoldBase; SynEditHighlighter, SynEditHighlighterFoldBase;

View File

@ -44,9 +44,7 @@ uses
{$ENDIF} {$ENDIF}
Registry, IniFiles, Registry, IniFiles,
{$ENDIF} {$ENDIF}
SynEditTypes, SynEditTypes, SynEditMiscClasses, SynEditTextBase;
SynEditMiscClasses,
SynEditTextBuffer, SynEditTextBase;
{$DEFINE _Gp_MustEnhanceRegistry} {$DEFINE _Gp_MustEnhanceRegistry}
{$IFDEF SYN_COMPILER_4_UP} {$IFDEF SYN_COMPILER_4_UP}
@ -258,7 +256,7 @@ type
function GetEol: Boolean; virtual; abstract; function GetEol: Boolean; virtual; abstract;
function GetRange: Pointer; virtual; function GetRange: Pointer; virtual;
function GetToken: String; virtual; abstract; function GetToken: String; virtual; abstract;
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); virtual; abstract; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); virtual; abstract;
function GetTokenAttribute: TSynHighlighterAttributes; virtual; abstract; function GetTokenAttribute: TSynHighlighterAttributes; virtual; abstract;
function GetTokenKind: integer; virtual; abstract; function GetTokenKind: integer; virtual; abstract;
function GetTokenPos: Integer; virtual; abstract; function GetTokenPos: Integer; virtual; abstract;

View File

@ -38,8 +38,8 @@ uses
{$ELSE} {$ELSE}
FileUtil, LCLProc, LCLIntf, LCLType, FileUtil, LCLProc, LCLIntf, LCLType,
{$ENDIF} {$ENDIF}
SynEditHighlighter, SynEditTypes, SynEditMiscClasses, SynEditTextBuffer, SynEditHighlighter, SynEditTextBuffer,
SynEditTextBase, AvgLvlTree; AvgLvlTree;
type type
@ -160,8 +160,6 @@ type
); override; ); override;
end; end;
TSynCustomHighlighterClass = class of TSynCustomFoldHighlighter;
{ TSynCustomHighlighterRanges } { TSynCustomHighlighterRanges }
TSynCustomHighlighterRanges = class TSynCustomHighlighterRanges = class

View File

@ -26,7 +26,7 @@ unit SynEditMarkup;
interface interface
uses uses
Classes, SysUtils, Graphics, SynEditTextBase, SynEditTextBuffer, Classes, SysUtils, Graphics, SynEditTextBase,
SynEditMiscClasses, SynEditMiscProcs, Controls, SynEditHighlighter; SynEditMiscClasses, SynEditMiscProcs, Controls, SynEditHighlighter;
type type

View File

@ -26,7 +26,7 @@ unit SynEditTextBase;
interface interface
uses uses
Classes, SysUtils, LCLProc, SynEditTypes, SynEditMiscProcs, SynEditKeyCmds; Classes, SysUtils, LCLProc, SynEditMiscProcs, SynEditKeyCmds;
type type
TSynEditStrings = class; TSynEditStrings = class;

View File

@ -43,7 +43,7 @@ interface
uses uses
Classes, SysUtils, SynEditTextBase, Classes, SysUtils, SynEditTextBase,
FileUtil, LCLProc, FPCAdds, LCLIntf, LCLType, FileUtil, LCLProc, LCLIntf, LCLType,
SynEditTypes, SynEditMiscProcs; SynEditTypes, SynEditMiscProcs;
const const

View File

@ -27,7 +27,7 @@ interface
uses uses
LCLProc, LCLProc,
Classes, SysUtils, SynEditTextBase, SynEditTextBuffer, SynEditMiscProcs; Classes, SysUtils, SynEditTextBase;
const const
// Offset to add to LengthOfLine, if Line has no tabs. // Offset to add to LengthOfLine, if Line has no tabs.

View File

@ -28,7 +28,7 @@ interface
uses uses
LCLProc, LCLProc,
Classes, SysUtils, SynEditTypes, SynEditTextBase, SynEditTextBuffer, Classes, SysUtils, SynEditTextBase,
SynEditPointClasses, SynEditMiscProcs; SynEditPointClasses, SynEditMiscProcs;
type type

View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, Graphics, LCLType, LCLIntf, SynGutterBase, Classes, SysUtils, Graphics, LCLType, LCLIntf, SynGutterBase,
SynEditMiscProcs, SynEditMiscClasses, SynTextDrawer, SynEditFoldedView; SynTextDrawer, SynEditFoldedView;
type type
{ TSynGutterChanges } { TSynGutterChanges }

View File

@ -175,7 +175,7 @@ type
function GetTokenID: TtkTokenKind; function GetTokenID: TtkTokenKind;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -823,8 +823,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynAnySyn.GetTokenEx(var TokenStart: PChar; procedure TSynAnySyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -241,7 +241,7 @@ type
procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber:Integer); override; procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber:Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -1474,8 +1474,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynCppSyn.GetTokenEx(var TokenStart: PChar; procedure TSynCppSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -252,7 +252,7 @@ type
procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override; procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -1666,7 +1666,7 @@ end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynCssSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); procedure TSynCssSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;

View File

@ -420,7 +420,7 @@ type
procedure SetLine(const NewValue: string; LineNumber:Integer); override; procedure SetLine(const NewValue: string; LineNumber:Integer); override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -2223,8 +2223,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynHTMLSyn.GetTokenEx(var TokenStart: PChar; procedure TSynHTMLSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -211,7 +211,7 @@ type
LineNumber:Integer); override; LineNumber:Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -1317,7 +1317,7 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynJavaSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer procedure TSynJavaSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer
); );
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;

View File

@ -273,7 +273,7 @@ type
function GetRange: Pointer; override; function GetRange: Pointer; override;
function GetTokenID: TtkTokenKind; function GetTokenID: TtkTokenKind;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override; procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override;
function GetToken: String; override; function GetToken: String; override;
@ -1788,7 +1788,7 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynJScriptSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); procedure TSynJScriptSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -122,7 +122,7 @@ type
LineNumber: Integer); override; LineNumber: Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -515,8 +515,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynLFMSyn.GetTokenEx(var TokenStart: PChar; procedure TSynLFMSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -177,7 +177,7 @@ type
function GetRange: Pointer; override; function GetRange: Pointer; override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -376,8 +376,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynMultiSyn.GetTokenEx(var TokenStart: PChar; procedure TSynMultiSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
if DefaultHighlighter = nil then begin if DefaultHighlighter = nil then begin
if fLine<>'' then begin if fLine<>'' then begin

View File

@ -58,7 +58,7 @@ uses
Windows, Messages, Windows, Messages,
{$ENDIF} {$ENDIF}
Classes, Registry, Controls, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs, Classes, Registry, Controls, Graphics, SynEditHighlighterFoldBase, SynEditMiscProcs,
SynEditTypes, SynEditHighlighter, SynEditTextBuffer, SynEditTextBase, SynEditTypes, SynEditHighlighter, SynEditTextBuffer,
SynEditStrConst; SynEditStrConst;
type type
@ -408,7 +408,7 @@ type
function GetRange: Pointer; override; function GetRange: Pointer; override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenID: TtkTokenKind; function GetTokenID: TtkTokenKind;
@ -2234,7 +2234,7 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynPasSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); procedure TSynPasSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
if TokenLength>0 then begin if TokenLength>0 then begin

View File

@ -375,7 +375,7 @@ type
LineNumber:Integer); override; LineNumber:Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -2547,8 +2547,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynPerlSyn.GetTokenEx(var TokenStart: PChar; procedure TSynPerlSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -210,7 +210,7 @@ type
procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override; procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: String; LineNumber: Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
@ -1427,7 +1427,7 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynPHPSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); procedure TSynPHPSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -77,7 +77,7 @@ type
function GetRange: Pointer; override; function GetRange: Pointer; override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -194,8 +194,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynPositionHighlighter.GetTokenEx(var TokenStart: PChar; procedure TSynPositionHighlighter.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=fTokenEnd-fTokenPos; TokenLength:=fTokenEnd-fTokenPos;
if TokenLength>0 then begin if TokenLength>0 then begin

View File

@ -162,7 +162,7 @@ type
procedure SetRange(Value: Pointer); override; procedure SetRange(Value: Pointer); override;
procedure ResetRange; override; procedure ResetRange; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
published published
property CommentAttri: TSynHighlighterAttributes read fCommentAttri property CommentAttri: TSynHighlighterAttributes read fCommentAttri
@ -486,8 +486,8 @@ begin
end; { SetLine } end; { SetLine }
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynPythonSyn.GetTokenEx(var TokenStart: PChar; procedure TSynPythonSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -174,7 +174,7 @@ type
function GetRange: Pointer; override; function GetRange: Pointer; override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
@ -1459,7 +1459,7 @@ begin
Setstring(Result, (FLine + fTokenPos), Len); Setstring(Result, (FLine + fTokenPos), Len);
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynSQLSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); procedure TSynSQLSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -118,7 +118,7 @@ type
LineNumber:Integer); override; LineNumber:Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
@ -340,7 +340,7 @@ begin
end; { GetToken } end; { GetToken }
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynTeXSyn.GetTokenEx(var TokenStart: PChar; var TokenLength: integer); procedure TSynTeXSyn.GetTokenEx(out TokenStart: PChar; out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -137,7 +137,7 @@ type
function IsSecondKeyWord(aToken: string): Boolean; function IsSecondKeyWord(aToken: string): Boolean;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; /////TL: Added 2003-06-11 procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; /////TL: Added 2003-06-11
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -717,8 +717,8 @@ end;
////TL 2003-06-11: Added the following to satisfy abstract method override ////TL 2003-06-11: Added the following to satisfy abstract method override
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynUNIXShellScriptSyn.GetTokenEx(var TokenStart: PChar; procedure TSynUNIXShellScriptSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -212,7 +212,7 @@ type
procedure SetLine({$IFDEF FPC} const {$ENDIF} NewValue: String; LineNumber: Integer); override; procedure SetLine({$IFDEF FPC} const {$ENDIF} NewValue: String; LineNumber: Integer); override;
function GetToken: String; override; function GetToken: String; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -1202,8 +1202,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynVBSyn.GetTokenEx(var TokenStart: PChar; procedure TSynVBSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -159,7 +159,7 @@ type
procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: string; LineNumber:Integer); override; procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: string; LineNumber:Integer); override;
function GetToken: string; override; function GetToken: string; override;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override; function GetTokenKind: integer; override;
@ -809,8 +809,8 @@ begin
end; end;
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynXMLSyn.GetTokenEx(var TokenStart: PChar; procedure TSynXMLSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;

View File

@ -1,7 +1,7 @@
object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm
Left = 207 Left = 1772
Height = 300 Height = 300
Top = 207 Top = 92
Width = 190 Width = 190
ActiveControl = SynObjectPartsListBox ActiveControl = SynObjectPartsListBox
BorderStyle = bsSizeToolWin BorderStyle = bsSizeToolWin
@ -25,7 +25,6 @@ object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm
ButtonHeight = 40 ButtonHeight = 40
ButtonWidth = 44 ButtonWidth = 44
Caption = 'ToolBar1' Caption = 'ToolBar1'
Ctl3D = False
ShowCaptions = True ShowCaptions = True
TabOrder = 0 TabOrder = 0
object AddButton: TToolButton object AddButton: TToolButton
@ -80,7 +79,6 @@ object SynObjectPartListPropertyEditorForm: TSynObjectPartListPropertyEditorForm
Align = alTop Align = alTop
Anchors = [] Anchors = []
AutoComplete = False AutoComplete = False
Ctl3D = False
ItemHeight = 13 ItemHeight = 13
ItemWidth = 0 ItemWidth = 0
Style = csDropDownList Style = csDropDownList

View File

@ -2,29 +2,29 @@
LazarusResources.Add('TSynObjectPartListPropertyEditorForm','FORMDATA',[ LazarusResources.Add('TSynObjectPartListPropertyEditorForm','FORMDATA',[
'TPF0$TSynObjectPartListPropertyEditorForm#SynObjectPartListPropertyEditorFor' 'TPF0$TSynObjectPartListPropertyEditorForm#SynObjectPartListPropertyEditorFor'
+'m'#4'Left'#3#207#0#6'Height'#3','#1#3'Top'#3#207#0#5'Width'#3#190#0#13'Acti' +'m'#4'Left'#3#236#6#6'Height'#3','#1#3'Top'#2'\'#5'Width'#3#190#0#13'ActiveC'
+'veControl'#7#21'SynObjectPartsListBox'#11'BorderStyle'#7#13'bsSizeToolWin'#7 +'ontrol'#7#21'SynObjectPartsListBox'#11'BorderStyle'#7#13'bsSizeToolWin'#7'C'
+'Caption'#6'#SynObjectPartListPropertyEditorForm'#12'ClientHeight'#3','#1#11 +'aption'#6'#SynObjectPartListPropertyEditorForm'#12'ClientHeight'#3','#1#11
+'ClientWidth'#3#190#0#21'Constraints.MinHeight'#2'd'#20'Constraints.MinWidth' +'ClientWidth'#3#190#0#21'Constraints.MinHeight'#2'd'#20'Constraints.MinWidth'
+#3#190#0#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#8'Posit' +#3#190#0#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#8'Posit'
+'ion'#7#16'poDefaultPosOnly'#10'LCLVersion'#6#6'0.9.27'#0#8'TToolBar'#8'Tool' +'ion'#7#16'poDefaultPosOnly'#10'LCLVersion'#6#6'0.9.27'#0#8'TToolBar'#8'Tool'
+'Bar1'#21'AnchorSideTop.Control'#7#13'ClassComboBox'#18'AnchorSideTop.Side'#7 +'Bar1'#21'AnchorSideTop.Control'#7#13'ClassComboBox'#18'AnchorSideTop.Side'#7
+#9'asrBottom'#4'Left'#2#0#6'Height'#2'*'#3'Top'#2#0#5'Width'#3#190#0#8'AutoS' +#9'asrBottom'#4'Left'#2#0#6'Height'#2'*'#3'Top'#2#0#5'Width'#3#190#0#8'AutoS'
+'ize'#9#12'ButtonHeight'#2'('#11'ButtonWidth'#2','#7'Caption'#6#8'ToolBar1'#5 +'ize'#9#12'ButtonHeight'#2'('#11'ButtonWidth'#2','#7'Caption'#6#8'ToolBar1'
+'Ctl3D'#8#12'ShowCaptions'#9#8'TabOrder'#2#0#0#11'TToolButton'#9'AddButton'#4 +#12'ShowCaptions'#9#8'TabOrder'#2#0#0#11'TToolButton'#9'AddButton'#4'Left'#2
+'Left'#2#1#3'Top'#2#2#7'Caption'#6#3'Add'#7'OnClick'#7#14'AddButtonClick'#0#0 +#1#3'Top'#2#2#7'Caption'#6#3'Add'#7'OnClick'#7#14'AddButtonClick'#0#0#11'TTo'
+#11'TToolButton'#12'DeleteButton'#4'Left'#2'-'#3'Top'#2#2#7'Caption'#6#6'Del' +'olButton'#12'DeleteButton'#4'Left'#2'-'#3'Top'#2#2#7'Caption'#6#6'Delete'#7
+'ete'#7'OnClick'#7#17'DeleteButtonClick'#0#0#11'TToolButton'#11'ToolButton3' +'OnClick'#7#17'DeleteButtonClick'#0#0#11'TToolButton'#11'ToolButton3'#4'Left'
+#4'Left'#2'Y'#3'Top'#2#2#5'Width'#2#10#7'Caption'#6#11'ToolButton3'#5'Style' +#2'Y'#3'Top'#2#2#5'Width'#2#10#7'Caption'#6#11'ToolButton3'#5'Style'#7#12'tb'
+#7#12'tbsSeparator'#0#0#11'TToolButton'#12'MoveUpButton'#4'Left'#2'c'#3'Top' +'sSeparator'#0#0#11'TToolButton'#12'MoveUpButton'#4'Left'#2'c'#3'Top'#2#2#7
+#2#2#7'Caption'#6#2'Up'#7'OnClick'#7#17'MoveUpButtonClick'#0#0#11'TToolButto' +'Caption'#6#2'Up'#7'OnClick'#7#17'MoveUpButtonClick'#0#0#11'TToolButton'#14
+'n'#14'MoveDownButton'#4'Left'#3#143#0#3'Top'#2#2#7'Caption'#6#4'Down'#7'OnC' +'MoveDownButton'#4'Left'#3#143#0#3'Top'#2#2#7'Caption'#6#4'Down'#7'OnClick'#7
+'lick'#7#19'MoveDownButtonClick'#0#0#0#8'TListBox'#21'SynObjectPartsListBox' +#19'MoveDownButtonClick'#0#0#0#8'TListBox'#21'SynObjectPartsListBox'#4'Left'
+#4'Left'#2#0#6'Height'#3#237#0#3'Top'#2'?'#5'Width'#3#190#0#5'Align'#7#8'alC' +#2#0#6'Height'#3#237#0#3'Top'#2'?'#5'Width'#3#190#0#5'Align'#7#8'alClient'#10
+'lient'#10'ItemHeight'#2#0#7'OnClick'#7#26'SynObjectPartsListBoxClick'#8'Tab' +'ItemHeight'#2#0#7'OnClick'#7#26'SynObjectPartsListBoxClick'#8'TabOrder'#2#1
+'Order'#2#1#0#0#9'TComboBox'#13'ClassComboBox'#21'AnchorSideTop.Control'#7#8 +#0#0#9'TComboBox'#13'ClassComboBox'#21'AnchorSideTop.Control'#7#8'ToolBar1'
+'ToolBar1'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3 +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3'Top'#2'*'
+'Top'#2'*'#5'Width'#3#190#0#5'Align'#7#5'alTop'#7'Anchors'#11#0#12'AutoCompl' +#5'Width'#3#190#0#5'Align'#7#5'alTop'#7'Anchors'#11#0#12'AutoComplete'#8#10
+'ete'#8#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0#5'Style'#7#14'csDrop' +'ItemHeight'#2#13#9'ItemWidth'#2#0#5'Style'#7#14'csDropDownList'#8'TabOrder'
+'DownList'#8'TabOrder'#2#2#0#0#0 +#2#2#0#0#0
]); ]);

View File

@ -24,7 +24,7 @@ interface
uses uses
Classes, SysUtils, LCLProc, Classes, SysUtils, LCLProc,
SynGutter, SynGutterBase, SynEditMiscClasses, SynGutterBase, SynEditMiscClasses,
LResources, PropEdits, Forms, StdCtrls, ComCtrls, Dialogs, LResources, PropEdits, Forms, StdCtrls, ComCtrls, Dialogs,
ObjInspStrConsts, Controls, IDEImagesIntf, typinfo; ObjInspStrConsts, Controls, IDEImagesIntf, typinfo;

View File

@ -343,7 +343,7 @@ type
function GetToken: string; override; function GetToken: string; override;
////TL Added the following 3 lines... and the implementation procedure ////TL Added the following 3 lines... and the implementation procedure
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure GetTokenEx(var TokenStart: PChar; var TokenLength: integer); override; ////TL: Added 2003-06-11 procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override; ////TL: Added 2003-06-11
{$ENDIF} {$ENDIF}
function GetTokenAttribute: TSynHighlighterAttributes; override; function GetTokenAttribute: TSynHighlighterAttributes; override;
@ -1718,8 +1718,8 @@ end;
////TL 2003-06-12: Added the following to satisfy abstract method override ////TL 2003-06-12: Added the following to satisfy abstract method override
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
procedure TSynUniSyn.GetTokenEx(var TokenStart: PChar; procedure TSynUniSyn.GetTokenEx(out TokenStart: PChar;
var TokenLength: integer); out TokenLength: integer);
begin begin
TokenLength:=Run-fTokenPos; TokenLength:=Run-fTokenPos;
TokenStart:=FLine + fTokenPos; TokenStart:=FLine + fTokenPos;