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

Fixes X11 font path and compilation

Browse Source 
git-svn-id: trunk@35692 -
This commit is contained in:
sekelsenmat 2012-03-03 20:44:26 +00:00
parent 276ce26bb5
commit c65328d7bc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/customdrawn/customdrawnint.pas
View File

@ -395,6 +395,8 @@ const
{$ifdef CD_Cocoa} {$ifdef CD_Cocoa}
const const
CDBackendNativeHandle = nhtCocoaNSWindow; CDBackendNativeHandle = nhtCocoaNSWindow;
{$define CD_HasNativeFormHandle}
{$endif}
{ TLazCDCustomFont } { TLazCDCustomFont }
@ -414,9 +416,6 @@ begin
inherited Destroy; inherited Destroy;
end; end;
{$define CD_HasNativeFormHandle}
{$endif}
{$I customdrawnobject.inc} {$I customdrawnobject.inc}
{$I customdrawnwinapi.inc} {$I customdrawnwinapi.inc}

2
lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc
View File

@ -633,7 +633,7 @@ end;*)
{$ifndef CD_UseNativeText} {$ifndef CD_UseNativeText}
function TCDWidgetSet.BackendGetFontPath(const LogFont: TLogFont; const LongFontName: string): string; function TCDWidgetSet.BackendGetFontPath(const LogFont: TLogFont; const LongFontName: string): string;
begin begin
Result := '/Library/Fonts/Arial.ttf'; Result := '/usr/share/fonts/TTF/liberation/LiberationSans-Regular.ttf';
end; end;
{$endif} {$endif}