Delphi/CEF4Delphi
1
0
Fork 0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2024-11-15 07:45:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed build issue in Android projects although it's not supported

Browse Source
This commit is contained in:
Salvador Díaz Fau 2024-04-26 15:54:09 +02:00
parent 82f6d8eeb6
commit 4d80d82588
5 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/uCEFApplicationCore.pas
View File

@ -48,6 +48,11 @@ const
CHROMEELF_DLL = '';
{$ENDIF}
{$IFDEF ANDROID}
LIBCEF_DLL = '';
CHROMEELF_DLL = '';
{$ENDIF}
// for InitLibLocationFromArgs
LIBCEF_PAK = 'cef.pak';
LIBCEF_LOCALE_DIR = 'locales';

5
source/uCEFFMXWindowParent.pas
View File

@ -70,7 +70,7 @@ implementation
// It's also necessary to call "Reparent" to add this component as a child component to your form.
uses
System.SysUtils, FMX.Platform, FMX.Platform.Win,
System.SysUtils, FMX.Platform, {$IFDEF MSWINDOWS}FMX.Platform.Win,{$ENDIF}
uCEFApplicationCore;
{$IFDEF DELPHI17_UP}
@ -159,8 +159,9 @@ end;
procedure TFMXWindowParent.Notification(AComponent: TComponent; Operation: TOperation);
begin
inherited Notification(AComponent, Operation);
{$IFDEF MSWINDOWS}
if (Operation = opRemove) and (AComponent = FChromium) then FChromium := nil;
{$ENDIF}
end;

23
source/uCEFMiscFunctions.pas
View File

@ -311,6 +311,12 @@ procedure WindowInfoAsPopUp(var aWindowInfo : TCefWindowInfo; aParent : TCefWind
procedure WindowInfoAsWindowless(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring = '');
{$ENDIF}
{$IFDEF ANDROID}
procedure WindowInfoAsChild(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; aRect : TRect; const aWindowName : ustring = ''; aExStyle : DWORD = 0);
procedure WindowInfoAsPopUp(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring = ''; aExStyle : DWORD = 0);
procedure WindowInfoAsWindowless(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring = ''; aExStyle : DWORD = 0);
{$ENDIF}
{$IFDEF MSWINDOWS}
function ProcessUnderWow64(hProcess: THandle; Wow64Process: PBOOL): BOOL; stdcall; external Kernel32DLL name 'IsWow64Process';
function PathIsRelativeAnsi(pszPath: LPCSTR): BOOL; stdcall; external SHLWAPIDLL name 'PathIsRelativeA';
@ -1465,6 +1471,23 @@ begin
end;
{$ENDIF}
{$IFDEF ANDROID}
procedure WindowInfoAsChild(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; aRect : TRect; const aWindowName : ustring; aExStyle : DWORD);
begin
//
end;
procedure WindowInfoAsPopUp(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring; aExStyle : DWORD);
begin
//
end;
procedure WindowInfoAsWindowless(var aWindowInfo : TCefWindowInfo; aParent : TCefWindowHandle; const aWindowName : ustring; aExStyle : DWORD);
begin
//
end;
{$ENDIF}
function CefIsCertStatusError(Status : TCefCertStatus) : boolean;
begin
Result := (GlobalCEFApp <> nil) and

28
source/uCEFTypes.pas
View File

@ -325,13 +325,37 @@ type
/// </remarks>
TCefCursorHandle = type LongWord;
{$ENDIF}
/// <summary>
/// Native event handle.
/// </summary>
/// <remarks>
/// <para><see href="https://bitbucket.org/chromiumembedded/cef/src/master/include/internal/cef_types_linux.h">CEF source file: /include/internal/cef_types_linux.h (cef_event_handle_t)</see></para>
/// </remarks>
TCefEventHandle = type PXEvent;
{$ENDIF}
{$IFDEF ANDROID}
/// <summary>
/// Native Window handle.
/// </summary>
/// <remarks>
/// <para><see href="https://bitbucket.org/chromiumembedded/cef/src/master/include/internal/cef_types_win.h">CEF source file: /include/internal/cef_types_win.h (cef_window_handle_t)</see></para>
/// </remarks>
TCefWindowHandle = type UIntPtr;
/// <summary>
/// Native Cursor handle.
/// </summary>
/// <remarks>
/// <para><see href="https://bitbucket.org/chromiumembedded/cef/src/master/include/internal/cef_types_win.h">CEF source file: /include/internal/cef_types_win.h (cef_cursor_handle_t)</see></para>
/// </remarks>
TCefCursorHandle = type UIntPtr;
/// <summary>
/// Native event handle.
/// </summary>
/// <remarks>
/// <para><see href="https://bitbucket.org/chromiumembedded/cef/src/master/include/internal/cef_types_linux.h">CEF source file: /include/internal/cef_types_linux.h (cef_event_handle_t)</see></para>
/// <para><see href="https://bitbucket.org/chromiumembedded/cef/src/master/include/internal/cef_types_win.h">CEF source file: /include/internal/cef_types_win.h (cef_event_handle_t)</see></para>
/// </remarks>
TCefEventHandle = type PXEvent;
TCefEventHandle = type UIntPtr;
{$ENDIF}
/// <summary>

2
update_CEF4Delphi.json
View File

@ -2,7 +2,7 @@
"UpdateLazPackages" : [
{
"ForceNotify" : true,
"InternalVersion" : 585,
"InternalVersion" : 586,
"Name" : "cef4delphi_lazarus.lpk",
"Version" : "123.0.13"
}