mirror of
https://github.com/salvadordf/CEF4Delphi.git
synced 2025-01-03 10:15:38 +02:00
Merge pull request #168 from ashumkin/xe7
Fix SimpleFMXBrowser compilation failures with Delphi 10 Seattle and XE7
This commit is contained in:
commit
376606779a
@ -107,7 +107,11 @@ end;
|
|||||||
|
|
||||||
function TFMXApplicationService.GetVersionString: string;
|
function TFMXApplicationService.GetVersionString: string;
|
||||||
begin
|
begin
|
||||||
|
{$IFDEF DELPHI22_UP}
|
||||||
Result := OldFMXApplicationService.GetVersionString;
|
Result := OldFMXApplicationService.GetVersionString;
|
||||||
|
{$ELSE DELPHI22_UP}
|
||||||
|
Result := 'unsupported yet';
|
||||||
|
{$ENDIF DELPHI22_UP}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TFMXApplicationService.Run;
|
procedure TFMXApplicationService.Run;
|
||||||
|
@ -207,18 +207,9 @@ begin
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSimpleFMXBrowserFrm.ResizeChild;
|
procedure TSimpleFMXBrowserFrm.ResizeChild;
|
||||||
var
|
|
||||||
TempRect : System.Types.TRect;
|
|
||||||
begin
|
begin
|
||||||
if (FMXWindowParent <> nil) then
|
if (FMXWindowParent <> nil) then
|
||||||
begin
|
FMXWindowParent.SetBounds(0, round(AddressPnl.Height), ClientWidth - 1, ClientHeight - 1);
|
||||||
TempRect.Top := round(AddressPnl.Height);
|
|
||||||
TempRect.Left := 0;
|
|
||||||
TempRect.Right := ClientWidth - 1;
|
|
||||||
TempRect.Bottom := ClientHeight - 1;
|
|
||||||
|
|
||||||
FMXWindowParent.SetBounds(TempRect);
|
|
||||||
end;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSimpleFMXBrowserFrm.CreateFMXWindowParent;
|
procedure TSimpleFMXBrowserFrm.CreateFMXWindowParent;
|
||||||
|
@ -49,7 +49,7 @@ uses
|
|||||||
{$IFDEF MSWINDOWS}
|
{$IFDEF MSWINDOWS}
|
||||||
WinApi.Windows, WinApi.Messages,
|
WinApi.Windows, WinApi.Messages,
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
FMX.Types, FMX.Platform, FMX.Controls, FMX.Forms,
|
FMX.Types, FMX.Platform, FMX.Forms,
|
||||||
uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFMiscFunctions, uCEFClient,
|
uCEFTypes, uCEFInterfaces, uCEFLibFunctions, uCEFMiscFunctions, uCEFClient,
|
||||||
uCEFConstants, uCEFTask, uCEFChromiumEvents, uCEFChromiumOptions, uCEFChromiumFontOptions,
|
uCEFConstants, uCEFTask, uCEFChromiumEvents, uCEFChromiumOptions, uCEFChromiumFontOptions,
|
||||||
uCEFPDFPrintOptions;
|
uCEFPDFPrintOptions;
|
||||||
|
Loading…
Reference in New Issue
Block a user