lcl: replace UTF8String with String type

git-svn-id: trunk@33552 -
This commit is contained in:
paul 2011-11-16 05:52:31 +00:00
parent 8ee87295fc
commit cd6febc8f8
3 changed files with 3 additions and 3 deletions

View File

@ -819,7 +819,7 @@ function TCarbonWidgetSet.EnumFontFamiliesEx(DC: HDC; lpLogFont: PLogFont;
var var
FamilyCount: LongWord; FamilyCount: LongWord;
FamilyListPtr, PFamily: ^ATSUFontID; FamilyListPtr, PFamily: ^ATSUFontID;
FontName: UTF8String; FontName: String;
EnumLogFont: TEnumLogFontEx; EnumLogFont: TEnumLogFontEx;
Metric: TNewTextMetricEx; Metric: TNewTextMetricEx;
FontType, I: Integer; FontType, I: Integer;

View File

@ -511,7 +511,7 @@ end;
function CarbonFontIDToFontName(ID: ATSUFontID): String; function CarbonFontIDToFontName(ID: ATSUFontID): String;
var var
NameLength: LongWord; NameLength: LongWord;
FontName: UTF8String; FontName: String;
const const
SName = 'CarbonFontIDToFontName'; SName = 'CarbonFontIDToFontName';
begin begin

View File

@ -2054,7 +2054,7 @@ end;
function TWin32WidgetSet.GetTextExtentExPoint(DC: HDC; Str: PChar; function TWin32WidgetSet.GetTextExtentExPoint(DC: HDC; Str: PChar;
Count, MaxWidth: Integer; MaxCount, PartialWidths: PInteger; var Size: TSize): Boolean; Count, MaxWidth: Integer; MaxCount, PartialWidths: PInteger; var Size: TSize): Boolean;
var var
LCLStr: utf8string; LCLStr: string;
s: AnsiString; s: AnsiString;
w: WideString; w: WideString;
begin begin