From e495a0b0602fdef70ac568052ea8f78bbb112034 Mon Sep 17 00:00:00 2001 From: maxim Date: Sun, 19 Aug 2018 22:57:40 +0000 Subject: [PATCH] Merged revision(s) 58639 #e675379977 from trunk: Win32 and CustomDrawn: fix compilation with fpc trunk after r39480 #e67589ea6f. Issue #0034022. ........ git-svn-id: branches/fixes_1_8@58741 - --- lcl/interfaces/customdrawn/customdrawnwinapi_win.inc | 5 +++++ lcl/interfaces/win32/win32winapi.inc | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc b/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc index 92e7eb52fa..f762ce6e9c 100644 --- a/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc +++ b/lcl/interfaces/customdrawn/customdrawnwinapi_win.inc @@ -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; (*{------------------------------------------------------------------------------ diff --git a/lcl/interfaces/win32/win32winapi.inc b/lcl/interfaces/win32/win32winapi.inc index 6c8b3eb6e5..8be4969299 100644 --- a/lcl/interfaces/win32/win32winapi.inc +++ b/lcl/interfaces/win32/win32winapi.inc @@ -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; {------------------------------------------------------------------------------