From f8f9d420a79d993f80f7232742367c01a4b9e24c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Sat, 4 May 2019 09:53:50 +0200 Subject: [PATCH] Compilation fix for Lazarus in Linux --- source/uCEFBufferPanel.pas | 7 +++++-- source/uCEFMiscFunctions.pas | 6 +++--- update_CEF4Delphi.json | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/source/uCEFBufferPanel.pas b/source/uCEFBufferPanel.pas index 62763a2f..ebd987ce 100644 --- a/source/uCEFBufferPanel.pas +++ b/source/uCEFBufferPanel.pas @@ -52,7 +52,7 @@ uses {$ELSE} {$IFDEF MSWINDOWS}Windows, imm, {$ENDIF} Classes, Forms, Controls, Graphics, {$IFDEF FPC} - LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase, Win32Extra, + LCLProc, LCLType, LCLIntf, LResources, LMessages, InterfaceBase, {$IFDEF MSWINDOWS}Win32Extra,{$ENDIF} {$ELSE} Messages, {$ENDIF} @@ -371,11 +371,13 @@ begin end; function TBufferPanel.CopyBuffer : boolean; +{$IFDEF MSWINDOWS} var TempFunction : TBlendFunction; +{$ENDIF} begin Result := False; - + {$IFDEF MSWINDOWS} if BeginBufferDraw then try if (FBuffer <> nil) then @@ -405,6 +407,7 @@ begin finally EndBufferDraw; end; + {$ENDIF} end; procedure TBufferPanel.Paint; diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index db43db23..d6a44b90 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -637,7 +637,7 @@ end; {$IFDEF LINUX} procedure WindowInfoAsChild(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; aRect : TRect; const aWindowName : ustring = ''); begin - aWindowInfo.window_name := aWindowName; + aWindowInfo.window_name := CefString(aWindowName); aWindowInfo.x := aRect.left; aWindowInfo.y := aRect.top; aWindowInfo.width := aRect.right - aRect.left; @@ -651,7 +651,7 @@ end; procedure WindowInfoAsPopUp(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring = ''); begin - aWindowInfo.window_name := aWindowName; + aWindowInfo.window_name := CefString(aWindowName); aWindowInfo.x := 0; aWindowInfo.y := 0; aWindowInfo.width := 0; @@ -665,7 +665,7 @@ end; procedure WindowInfoAsWindowless(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring = ''); begin - aWindowInfo.window_name := aWindowName; + aWindowInfo.window_name := CefString(aWindowName); aWindowInfo.x := 0; aWindowInfo.y := 0; aWindowInfo.width := 0; diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index dbd272a0..23dc7515 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 5, + "InternalVersion" : 6, "Name" : "cef4delphi_lazarus.lpk", "Version" : "74.1.13.0" }