renamed GetStyleLength to GetContStyleLength and moved protected section

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@857 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2009-06-21 10:52:02 +00:00
parent b0e4a4d926
commit 98f42bc1d5

View File

@@ -50,13 +50,13 @@ type
procedure CreateWnd; override; procedure CreateWnd; override;
procedure UpdateRichMemo; virtual; procedure UpdateRichMemo; virtual;
procedure SetHideSelection(AValue: Boolean); procedure SetHideSelection(AValue: Boolean);
function GetContStyleLength(TextStart: Integer): Integer;
public public
procedure SetTextAttributes(TextStart, TextLen: Integer; const TextParams: TFontParams); virtual; procedure SetTextAttributes(TextStart, TextLen: Integer; const TextParams: TFontParams); virtual;
function GetTextAttributes(TextStart: Integer; var TextParams: TFontParams): Boolean; virtual; function GetTextAttributes(TextStart: Integer; var TextParams: TFontParams): Boolean; virtual;
function GetStyleRange(TextStart: Integer; var RangeStart, RangeLen: Integer): Boolean; virtual; function GetStyleRange(CharOfs: Integer; var RangeStart, RangeLen: Integer): Boolean; virtual;
procedure SetTextAttributes(TextStart, TextLen: Integer; AFont: TFont); procedure SetTextAttributes(TextStart, TextLen: Integer; AFont: TFont);
function GetStyleLength(TextStart: Integer): Integer;
procedure SetRangeColor(TextStart, TextLength: Integer; FontColor: TColor); procedure SetRangeColor(TextStart, TextLength: Integer; FontColor: TColor);
procedure SetRangeParams(TextStart, TextLength: Integer; ModifyMask: TTextModifyMask; procedure SetRangeParams(TextStart, TextLength: Integer; ModifyMask: TTextModifyMask;
const FontName: String; FontSize: Integer; FontColor: TColor; AddFontStyle, RemoveFontStyle: TFontStyles); const FontName: String; FontSize: Integer; FontColor: TColor; AddFontStyle, RemoveFontStyle: TFontStyles);
@@ -208,11 +208,11 @@ begin
Result := false; Result := false;
end; end;
function TCustomRichMemo.GetStyleRange(TextStart: Integer; var RangeStart, function TCustomRichMemo.GetStyleRange(CharOfs: Integer; var RangeStart,
RangeLen: Integer): Boolean; RangeLen: Integer): Boolean;
begin begin
if HandleAllocated then if HandleAllocated then
Result := TWSCustomRichMemoClass(WidgetSetClass).GetStyleRange(Self, TextStart, RangeStart, RangeLen) Result := TWSCustomRichMemoClass(WidgetSetClass).GetStyleRange(Self, CharOfs, RangeStart, RangeLen)
else begin else begin
RangeStart := -1; RangeStart := -1;
RangeLen := -1; RangeLen := -1;
@@ -220,7 +220,7 @@ begin
end; end;
end; end;
function TCustomRichMemo.GetStyleLength(TextStart: Integer): Integer; function TCustomRichMemo.GetContStyleLength(TextStart: Integer): Integer;
var var
ofs, len : Integer; ofs, len : Integer;
begin begin
@@ -254,7 +254,7 @@ begin
if tmm_Size in ModifyMask then p.Size := FontSize; if tmm_Size in ModifyMask then p.Size := FontSize;
if tmm_Styles in ModifyMask then p.Style := p.Style + AddFontStyle - RemoveFontStyle; if tmm_Styles in ModifyMask then p.Style := p.Style + AddFontStyle - RemoveFontStyle;
l := GetStyleLength(i); l := GetContStyleLength(i);
if i + l > j then l := j - i; if i + l > j then l := j - i;
if l = 0 then l := 1; if l = 0 then l := 1;
SetTextAttributes(i, l, p); SetTextAttributes(i, l, p);