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

LCL: customdrawn: fixed compilation

Browse Source 
git-svn-id: branches/fixes_1_6@50700 -
This commit is contained in:
mattias 2015-12-06 16:00:06 +00:00
parent b11375e489
commit 2b3197fd84
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ uses
{$endif} {$endif}
{$ifdef WinCE}aygshell,{$endif} {$ifdef WinCE}aygshell,{$endif}
// LazUtils // LazUtils
fileutil, lazutf8, LazFileUtils, lazutf8,
{$ifndef CD_UseNativeText} {$ifndef CD_UseNativeText}
// LazFreeType // LazFreeType
LazFreeTypeIntfDrawer, LazFreeType, EasyLazFreeType, IniFiles, LazFreeTypeIntfDrawer, LazFreeType, EasyLazFreeType, IniFiles,

6
lcl/interfaces/customdrawn/customdrawnproc.pas
View File

@ -10,7 +10,7 @@ uses
Types, Classes, SysUtils, Types, Classes, SysUtils,
fpimage, fpcanvas, Math, fpimage, fpcanvas, Math,
// LazUtils // LazUtils
fileutil, LazFileUtils,
{$ifndef CD_UseNativeText} {$ifndef CD_UseNativeText}
// LazFreeType // LazFreeType
TTTypes, LazFreeTypeIntfDrawer, LazFreeType, EasyLazFreeType, IniFiles, TTTypes, LazFreeTypeIntfDrawer, LazFreeType, EasyLazFreeType, IniFiles,
@ -534,8 +534,8 @@ begin
lControlStateEx.Font := lWinControl.Font; lControlStateEx.Font := lWinControl.Font;
lControlStateEx.Caption := lWinControl.Caption; lControlStateEx.Caption := lWinControl.Caption;
lControlStateEx.ParentRGBColor := lWinControl.GetRGBColorResolvingParent(); lControlStateEx.ParentRGBColor := lWinControl.GetRGBColorResolvingParent();
GetDefaultDrawer().DrawGroupBox(lControlCanvas, Size(lWinControl.Width, lWinControl.Height), GetDefaultDrawer().DrawGroupBox(lControlCanvas, Point(0,0),
[], lControlStateEx); Size(lWinControl.Width, lWinControl.Height), [], lControlStateEx);
finally finally
lControlStateEx.Free; lControlStateEx.Free;
lControlCanvas.RestoreState(-1); lControlCanvas.RestoreState(-1);

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

@ -1136,7 +1136,7 @@ begin
end end
else if (DFCS_BUTTONPUSH and uState) <> 0 then else if (DFCS_BUTTONPUSH and uState) <> 0 then
begin begin
GetDefaultDrawer().DrawButton(LazDC, lSize, lState, TCDButtonStateEx(lControlStateEx)); GetDefaultDrawer().DrawButton(LazDC, Point(0,0), lSize, lState, TCDButtonStateEx(lControlStateEx));
end end
else if (DFCS_BUTTONRADIOIMAGE and uState) <> 0 then else if (DFCS_BUTTONRADIOIMAGE and uState) <> 0 then
begin begin

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

@ -619,7 +619,7 @@ begin
XFreeFontPath(lXFontPath); XFreeFontPath(lXFontPath);
// Paths from the global config file // Paths from the global config file
if FileUtil.FileExistsUTF8(GlobalFontsConfFile) then if LazFileUtils.FileExistsUTF8(GlobalFontsConfFile) then
begin begin
try try
ReadXMLFile(Doc, GlobalFontsConfFile); ReadXMLFile(Doc, GlobalFontsConfFile);