pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Use TTranslateString in Column Hint and Text properties. Issue 26559

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4132 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
blikblum
2015-05-17 00:51:27 +00:00
parent e307a01d51
commit 4ab36a0463
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
View File

@ -1161,7 +1161,7 @@ type
TVirtualTreeColumn = class(TCollectionItem) TVirtualTreeColumn = class(TCollectionItem)
private private
FText, FText,
FHint: String; FHint: TTranslateString;
FLeft, FLeft,
FWidth: Integer; FWidth: Integer;
FPosition: TColumnPosition; FPosition: TColumnPosition;
@ -1208,7 +1208,7 @@ type
procedure SetPosition(Value: TColumnPosition); procedure SetPosition(Value: TColumnPosition);
procedure SetSpacing(Value: Integer); procedure SetSpacing(Value: Integer);
procedure SetStyle(Value: TVirtualTreeColumnStyle); procedure SetStyle(Value: TVirtualTreeColumnStyle);
procedure SetText(const Value: String); procedure SetText(const Value: TTranslateString);
procedure SetWidth(Value: Integer); procedure SetWidth(Value: Integer);
protected protected
procedure ComputeHeaderLayout(DC: HDC; const Client: TRect; UseHeaderGlyph, UseSortGlyph: Boolean; procedure ComputeHeaderLayout(DC: HDC; const Client: TRect; UseHeaderGlyph, UseSortGlyph: Boolean;
@ -1243,7 +1243,7 @@ type
property CheckState: TCheckState read FCheckState write SetCheckState default csUncheckedNormal; property CheckState: TCheckState read FCheckState write SetCheckState default csUncheckedNormal;
property CheckBox: Boolean read FCheckBox write SetCheckBox default False; property CheckBox: Boolean read FCheckBox write SetCheckBox default False;
property Color: TColor read FColor write SetColor stored IsColorStored; property Color: TColor read FColor write SetColor stored IsColorStored;
property Hint: String read FHint write FHint; property Hint: TTranslateString read FHint write FHint;
property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1; property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1;
property Layout: TVTHeaderColumnLayout read FLayout write SetLayout default blGlyphLeft; property Layout: TVTHeaderColumnLayout read FLayout write SetLayout default blGlyphLeft;
property Margin: Integer read FMargin write SetMargin default 4; property Margin: Integer read FMargin write SetMargin default 4;
@ -1254,7 +1254,7 @@ type
property Spacing: Integer read FSpacing write SetSpacing default 4; property Spacing: Integer read FSpacing write SetSpacing default 4;
property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText; property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText;
property Tag: Integer read FTag write FTag default 0; property Tag: Integer read FTag write FTag default 0;
property Text: String read FText write SetText; property Text: TTranslateString read FText write SetText;
property Width: Integer read FWidth write SetWidth default 50; property Width: Integer read FWidth write SetWidth default 50;
end; end;
@ -6614,7 +6614,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TVirtualTreeColumn.SetText(const Value: String); procedure TVirtualTreeColumn.SetText(const Value: TTranslateString);
begin begin
if FText <> Value then if FText <> Value then

10
components/virtualtreeview-new/trunk/VirtualTrees.pas
View File

@ -948,7 +948,7 @@ type
TVirtualTreeColumn = class(TCollectionItem) TVirtualTreeColumn = class(TCollectionItem)
private private
FText, FText,
FHint: String; FHint: TTranslateString;
FLeft, FLeft,
FWidth: Integer; FWidth: Integer;
FPosition: TColumnPosition; FPosition: TColumnPosition;
@ -1004,7 +1004,7 @@ type
procedure GetAbsoluteBounds(var Left, Right: Integer); procedure GetAbsoluteBounds(var Left, Right: Integer);
function GetDisplayName: string; override; function GetDisplayName: string; override;
function GetText: String; virtual; // [IPK] function GetText: String; virtual; // [IPK]
procedure SetText(const Value: String); virtual; // [IPK] private to protected & virtual procedure SetText(const Value: TTranslateString); virtual; // [IPK] private to protected & virtual
function GetOwner: TVirtualTreeColumns; reintroduce; function GetOwner: TVirtualTreeColumns; reintroduce;
property HasImage: Boolean read FHasImage; property HasImage: Boolean read FHasImage;
property ImageRect: TRect read FImageRect; property ImageRect: TRect read FImageRect;
@ -1035,7 +1035,7 @@ type
property CheckBox: Boolean read FCheckBox write SetCheckBox default False; property CheckBox: Boolean read FCheckBox write SetCheckBox default False;
property Color: TColor read FColor write SetColor stored IsColorStored; property Color: TColor read FColor write SetColor stored IsColorStored;
property DefaultSortDirection: TSortDirection read FDefaultSortDirection write FDefaultSortDirection default sdAscending; property DefaultSortDirection: TSortDirection read FDefaultSortDirection write FDefaultSortDirection default sdAscending;
property Hint: String read FHint write FHint stored False; property Hint: TTranslateString read FHint write FHint stored False;
property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1; property ImageIndex: TImageIndex read FImageIndex write SetImageIndex default -1;
property Layout: TVTHeaderColumnLayout read FLayout write SetLayout default blGlyphLeft; property Layout: TVTHeaderColumnLayout read FLayout write SetLayout default blGlyphLeft;
property Margin: Integer read FMargin write SetMargin default 4; property Margin: Integer read FMargin write SetMargin default 4;
@ -1046,7 +1046,7 @@ type
property Spacing: Integer read FSpacing write SetSpacing default 3; property Spacing: Integer read FSpacing write SetSpacing default 3;
property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText; property Style: TVirtualTreeColumnStyle read FStyle write SetStyle default vsText;
property Tag: NativeInt read FTag write FTag default 0; property Tag: NativeInt read FTag write FTag default 0;
property Text: String read GetText write SetText; property Text: TTranslateString read GetText write SetText;
property Width: Integer read FWidth write SetWidth default 50; property Width: Integer read FWidth write SetWidth default 50;
end; end;
@ -7104,7 +7104,7 @@ end;
//---------------------------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------------------------
procedure TVirtualTreeColumn.SetText(const Value: String); procedure TVirtualTreeColumn.SetText(const Value: TTranslateString);
begin begin
if FText <> Value then if FText <> Value then