diff --git a/lcl/interfaces/customdrawn/customdrawnint.pas b/lcl/interfaces/customdrawn/customdrawnint.pas index c3a0fa4cd4..521a53b48a 100644 --- a/lcl/interfaces/customdrawn/customdrawnint.pas +++ b/lcl/interfaces/customdrawn/customdrawnint.pas @@ -395,6 +395,8 @@ const {$ifdef CD_Cocoa} const CDBackendNativeHandle = nhtCocoaNSWindow; + {$define CD_HasNativeFormHandle} + {$endif} { TLazCDCustomFont } @@ -414,9 +416,6 @@ begin inherited Destroy; end; - {$define CD_HasNativeFormHandle} - {$endif} - {$I customdrawnobject.inc} {$I customdrawnwinapi.inc} diff --git a/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc b/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc index 4d590c0f48..799bc97a27 100644 --- a/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc +++ b/lcl/interfaces/customdrawn/customdrawnwinapi_x11.inc @@ -633,7 +633,7 @@ end;*) {$ifndef CD_UseNativeText} function TCDWidgetSet.BackendGetFontPath(const LogFont: TLogFont; const LongFontName: string): string; begin - Result := '/Library/Fonts/Arial.ttf'; + Result := '/usr/share/fonts/TTF/liberation/LiberationSans-Regular.ttf'; end; {$endif}