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

CustomDrawn: Fix compilation of CustomDrawn X11. Issue #37813, patch from Sven Barth.

Browse Source 
git-svn-id: trunk@63924 -
This commit is contained in:
juha 2020-09-26 09:32:24 +00:00
parent 0d1f1cb778
commit 5779a01102
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lcl/interfaces/customdrawn/customdrawndefines.inc
View File

@ -39,6 +39,9 @@
{$if defined(CD_WINDOWS)}
//{$define CD_UseNativeText}
{$endif}
{$if defined(CD_X11)}
{$define CD_UseNativeMonitors}
{$endif}
// ==================
// Other options

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

@ -1508,11 +1508,13 @@ begin
System.EnterCriticalsection(ACritSec^);
end;
{$ifndef CD_UseNativeMonitors}
function TCDWidgetSet.EnumDisplayMonitors(hdc: HDC; lprcClip: PRect;
lpfnEnum: MonitorEnumProc; dwData: LPARAM): LongBool;
begin
Result := lpfnEnum(1, 0, nil, dwData);
end;
{$endif}
(*
function CharsetToQtCharSet(const ALCLCharset: Byte): QFontDatabaseWritingSystem;
@ -2901,6 +2903,8 @@ begin
Result := 0;
end;
*)
{$ifndef CD_UseNativeMonitors}
function TCDWidgetSet.GetMonitorInfo(Monitor: HMONITOR; lpmi: PMonitorInfo): Boolean;
begin
Result := (lpmi <> nil) and (lpmi^.cbSize >= SizeOf(TMonitorInfo)) and (Monitor = 1);
@ -2909,6 +2913,7 @@ begin
lpmi^.rcWork:=lpmi^.rcMonitor;
lpmi^.dwFlags := MONITORINFOF_PRIMARY
end;
{$endif}
(*
{------------------------------------------------------------------------------
Method: TQtWidgetSet.GetDeviceSize