paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 01:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small improvements to unicode support under win32

Browse Source 
git-svn-id: trunk@11589 -
This commit is contained in:
sekelsenmat 2007-07-22 11:00:55 +00:00
parent 9c00283d84
commit f3694be3df
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcl/interfaces/win32/win32winapi.inc
View File

@ -206,7 +206,9 @@ var
Flags: Cardinal;
OldColor: COLORREF;
OldBackColor: COLORREF;
AnsiBuffer: string;
WideBuffer: widestring;
begin
Selected := (Data^.itemState AND ODS_SELECTED)>0;
@ -238,8 +240,23 @@ var
OldColor := Windows.SetTextColor(Data^._HDC, Windows.GetSysColor(COLOR_HIGHLIGHTTEXT));
OldBackColor := Windows.SetBkColor(Data^._HDC, Windows.GetSysColor(COLOR_HIGHLIGHT));
end;
{$ifdef WindowsUnicodeSupport}
if UnicodeEnabledOS then
begin
WideBuffer := Utf8Decode(CheckListBox.Items[Data^.ItemID]);
Windows.DrawTextW(Data^._HDC, PWideChar(WideBuffer), -1,
Rect, DT_SINGLELINE or DT_VCENTER or DT_NOPREFIX);
end
else
begin
AnsiBuffer := Utf8ToAnsi(CheckListBox.Items[Data^.ItemID]);
Windows.DrawText(Data^._HDC, PChar(AnsiBuffer), -1,
Rect, DT_SINGLELINE or DT_VCENTER or DT_NOPREFIX);
end;
{$else}
Windows.DrawText(Data^._HDC, PChar(CheckListBox.Items[Data^.ItemID]), -1,
Rect, DT_SINGLELINE or DT_VCENTER or DT_NOPREFIX);
{$endif}
if Selected then begin
Windows.SetTextColor(Data^._HDC, OldColor);
Windows.SetBkColor(Data^._HDC, OldBackColor);
@ -3455,7 +3472,11 @@ end;
------------------------------------------------------------------------------}
Function TWin32WidgetSet.TextOut(DC: HDC; X, Y: Integer; Str: PChar; Count: Integer): Boolean;
Begin
{$ifdef WindowsUnicodeSupport}
Result := Boolean(Windows.TextOutW(DC, X, Y, PWideChar(Utf8Decode(Str)), Count));
{$else}
Result := Boolean(Windows.TextOut(DC, X, Y, Str, Count));
{$endif}
End;
{------------------------------------------------------------------------------