From 0d656c63ff0c1ac6399b01b7bbf2fc653dc3d8ae Mon Sep 17 00:00:00 2001 From: bart <9132501-flyingsheep@users.noreply.gitlab.com> Date: Sun, 7 Jun 2015 09:46:32 +0000 Subject: [PATCH] LCL: Make thetype of TextHint TTranslateString instead of String (part of issue #0028129). git-svn-id: trunk@49285 - --- lcl/editbtn.pas | 10 +++++----- lcl/include/customedit.inc | 2 +- lcl/stdctrls.pp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lcl/editbtn.pas b/lcl/editbtn.pas index 874c63c4d3..77bca6cb92 100644 --- a/lcl/editbtn.pas +++ b/lcl/editbtn.pas @@ -120,7 +120,7 @@ type function GetSpacing: Integer; function GetTabStop: Boolean; function GetText: TCaption; - function GetTextHint: TCaption; + function GetTextHint: TTranslateString; function GetTextHintFontColor: TColor; function GetTextHintFontStyle: TFontStyles; function IsCustomGlyph : Boolean; @@ -185,7 +185,7 @@ type procedure SetSelText(AValue: String); procedure SetSpacing(const Value: integer); procedure SetTabStop(AValue: Boolean); - procedure SetTextHint(AValue: TCaption); + procedure SetTextHint(AValue: TTranslateString); procedure SetTextHintFontColor(AValue: TColor); procedure SetTextHintFontStyle(AValue: TFontStyles); protected @@ -300,7 +300,7 @@ type property SelText: String read GetSelText write SetSelText; property TabStop: Boolean read GetTabStop write SetTabStop default True; property Text: TCaption read GetText write SetText; - property TextHint: TCaption read GetTextHint write SetTextHint; + property TextHint: TTranslateString read GetTextHint write SetTextHint; property TextHintFontColor: TColor read GetTextHintFontColor write SetTextHintFontColor default clGrayText; property TextHintFontStyle: TFontStyles read GetTextHintFontStyle write SetTextHintFontStyle default [fsItalic]; @@ -1196,7 +1196,7 @@ begin Result := FEdit.Text; end; -function TCustomEditButton.GetTextHint: TCaption; +function TCustomEditButton.GetTextHint: TTranslateString; begin Result := FEdit.TextHint; end; @@ -1802,7 +1802,7 @@ begin FEdit.TabStop := AValue; end; -procedure TCustomEditButton.SetTextHint(AValue: TCaption); +procedure TCustomEditButton.SetTextHint(AValue: TTranslateString); begin FEdit.TextHint := AValue; end; diff --git a/lcl/include/customedit.inc b/lcl/include/customedit.inc index 739a86e842..9577663557 100644 --- a/lcl/include/customedit.inc +++ b/lcl/include/customedit.inc @@ -618,7 +618,7 @@ begin Result:=fCaretPos; end; -procedure TCustomEdit.SetTextHint(AValue: String); +procedure TCustomEdit.SetTextHint(AValue: TTranslateString); begin if (FTextHint = AValue) then Exit; FTextHint := AValue; diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp index 2490f4900d..d1c123292e 100644 --- a/lcl/stdctrls.pp +++ b/lcl/stdctrls.pp @@ -707,7 +707,7 @@ type FSelLength: integer; FSelStart: integer; FTextChangedByRealSetText: Boolean; - FTextHint: String; + FTextHint: TTranslateString; FTextHintShowing: Boolean; FSettingTextHint: Boolean; FTextHintFontColor: TColor; @@ -715,7 +715,7 @@ type FSavedFontColor: TColor; FSavedFontStyle: TFontStyles; FSavedParentFont: Boolean; - procedure SetTextHint(AValue: String); + procedure SetTextHint(AValue: TTranslateString); procedure ShowTextHint; procedure HideTextHint; procedure SetAlignment(const AValue: TAlignment); @@ -794,7 +794,7 @@ type property TabOrder; property TabStop default true; property Text; - property TextHint: String read FTextHint write SetTextHint; + property TextHint: TTranslateString read FTextHint write SetTextHint; property TextHintFontColor: TColor read FTextHintFontColor write FTextHintFontColor default clGrayText; property TextHintFontStyle: TFontStyles read FTextHintFontStyle write FTextHintFontStyle default [fsItalic]; end;