1
0
mirror of https://github.com/salvadordf/CEF4Delphi.git synced 2025-06-12 22:07:39 +02:00

Fix for duplicated resources in FMX apps made by SchneiderInfosystems

- The FMX demos now load the initial web page using the TFMXChromium.DefaultUrl property.
- Added the $(FrameworkType) conditional define to all the FMX demos.
- Added the $(FrameworkType) conditional define to the CEF4Delphi_FMX project.
This commit is contained in:
Salvador Díaz Fau
2019-03-20 15:56:14 +01:00
parent 00cb710e59
commit 2ed976d906
13 changed files with 79 additions and 51 deletions

View File

@ -50,7 +50,10 @@ interface
uses
{$IFDEF DELPHI16_UP}
{$IFDEF MSWINDOWS}WinApi.Windows, Vcl.Forms,{$ENDIF} System.Classes, System.UITypes,
{$IFDEF MSWINDOWS}
WinApi.Windows, {$IFNDEF FMX}Vcl.Forms,{$ENDIF}
{$ENDIF}
System.Classes, System.UITypes,
{$ELSE}
{$IFDEF MSWINDOWS}Windows, Forms,{$ENDIF} Classes, {$IFDEF FPC}dynlibs,{$ENDIF}
{$ENDIF}
@ -697,6 +700,7 @@ begin
if CheckCEFLibrary and LoadCEFlibrary then
begin
{$IFNDEF FPC}
{$IFNDEF FMX}
if FDestroyAppWindows and (ProcessType <> ptBrowser) and (Application <> nil) then
begin
// This is the fix for the issue #139
@ -712,6 +716,7 @@ begin
{$ENDIF}
end;
{$ENDIF}
{$ENDIF}
TempApp := TCustomCefApp.Create(self);
Result := (ExecuteProcess(TempApp) < 0) and InitializeLibrary(TempApp);