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

Merged revision(s) 58639 #e675379977 from trunk:

Browse Source 
Win32 and CustomDrawn: fix compilation with fpc trunk after r39480 #e67589ea6f. Issue #0034022.
........

git-svn-id: branches/fixes_1_8@58741 -
This commit is contained in:
maxim 2018-08-19 22:57:40 +00:00
parent b6d367d8c7
commit e495a0b060
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/customdrawn/customdrawnwinapi_win.inc
View File

@ -1302,8 +1302,13 @@ begin
Rec.LParam := LParam;
Rec.CallBack := CallBack;
LFW.lfFaceName := UTF8ToUTF16(FontName);
{$if fpc_fullversion < 30101}
Result := LongInt(Windows.EnumFontFamiliesExW(DC,
LFW, windows.FontEnumExProc(@EnumExProcRedirW), Windows.LParam(@Rec), Flags));
{$else}
Result := LongInt(Windows.EnumFontFamiliesExW(DC,
LFW, windows.FontEnumExProcW(@EnumExProcRedirW), Windows.LParam(@Rec), Flags));
{$ifend}
end;
(*{------------------------------------------------------------------------------

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

@ -1305,8 +1305,13 @@ begin
Rec.LParam := LParam;
Rec.CallBack := CallBack;
LFW.lfFaceName := UTF8ToUTF16(FontName);
{$if fpc_fullversion < 30101}
Result := LongInt(Windows.EnumFontFamiliesExW(DC,
LFW, windows.FontEnumExProc(@EnumExProcRedirW), Windows.LParam(@Rec), Flags));
{$else}
Result := LongInt(Windows.EnumFontFamiliesExW(DC,
LFW, windows.FontEnumExProcW(@EnumExProcRedirW), Windows.LParam(@Rec), Flags));
{$ifend}
end;
{------------------------------------------------------------------------------