From 03f9e9a1b9860ece476e1c9f667937d53370008d Mon Sep 17 00:00:00 2001 From: salvadordf Date: Sat, 19 Feb 2022 18:56:41 +0100 Subject: [PATCH] Update to CEF 98.2.0 Fixed issue #404 : Memory leak with empty TChromiumDefaultUrl Fixed crash in RasperryPi OS 64 bits --- README.md | 16 ++-- packages/cef4delphi_lazarus.lpk | 2 +- source/cef.inc | 24 +++++- source/uCEFAccessibilityHandler.pas | 6 +- source/uCEFApp.pas | 6 +- source/uCEFApplication.pas | 6 +- source/uCEFApplicationCore.pas | 78 ++++++++++--------- source/uCEFArgCopy.pas | 2 +- source/uCEFAudioHandler.pas | 6 +- source/uCEFAuthCallback.pas | 6 +- source/uCEFBaseRefCounted.pas | 6 +- source/uCEFBaseScopedWrapper.pas | 6 +- source/uCEFBeforeDownloadCallback.pas | 6 +- source/uCEFBinaryValue.pas | 6 +- source/uCEFBitmapBitBuffer.pas | 6 +- source/uCEFBoxLayout.pas | 6 +- source/uCEFBrowser.pas | 6 +- source/uCEFBrowserProcessHandler.pas | 6 +- source/uCEFBrowserView.pas | 6 +- source/uCEFBrowserViewComponent.pas | 6 +- source/uCEFBrowserViewDelegate.pas | 6 +- source/uCEFButton.pas | 6 +- source/uCEFButtonComponent.pas | 6 +- source/uCEFButtonDelegate.pas | 6 +- source/uCEFCallback.pas | 6 +- source/uCEFChromium.pas | 6 +- source/uCEFChromiumCore.pas | 21 +++-- source/uCEFChromiumEvents.pas | 6 +- source/uCEFChromiumFontOptions.pas | 6 +- source/uCEFChromiumOptions.pas | 6 +- source/uCEFChromiumWindow.pas | 6 +- source/uCEFClient.pas | 6 +- source/uCEFCommandLine.pas | 6 +- source/uCEFCompletionCallback.pas | 6 +- source/uCEFConstants.pas | 34 ++++---- source/uCEFContextMenuHandler.pas | 6 +- source/uCEFContextMenuParams.pas | 6 +- source/uCEFCookieAccessFilter.pas | 6 +- source/uCEFCookieManager.pas | 6 +- source/uCEFCookieVisitor.pas | 6 +- source/uCEFCustomStreamReader.pas | 6 +- source/uCEFDeleteCookiesCallback.pas | 6 +- source/uCEFDevToolsMessageObserver.pas | 6 +- source/uCEFDialogHandler.pas | 6 +- source/uCEFDictionaryValue.pas | 6 +- source/uCEFDisplay.pas | 6 +- source/uCEFDisplayHandler.pas | 6 +- source/uCEFDomDocument.pas | 6 +- source/uCEFDomNode.pas | 6 +- source/uCEFDomVisitor.pas | 6 +- source/uCEFDownLoadItem.pas | 6 +- source/uCEFDownloadHandler.pas | 6 +- source/uCEFDownloadImageCallBack.pas | 6 +- source/uCEFDownloadItemCallback.pas | 6 +- source/uCEFDragData.pas | 6 +- source/uCEFDragHandler.pas | 6 +- source/uCEFEndTracingCallback.pas | 6 +- source/uCEFExtension.pas | 6 +- source/uCEFExtensionHandler.pas | 6 +- source/uCEFFMXChromium.pas | 6 +- source/uCEFFMXWindowParent.pas | 6 +- source/uCEFFMXWorkScheduler.pas | 6 +- source/uCEFFileDialogCallback.pas | 6 +- source/uCEFFileDialogInfo.pas | 6 +- source/uCEFFillLayout.pas | 6 +- source/uCEFFindHandler.pas | 6 +- source/uCEFFocusHandler.pas | 6 +- source/uCEFFrame.pas | 6 +- source/uCEFFrameHandler.pas | 6 +- source/uCEFGetExtensionResourceCallback.pas | 6 +- source/uCEFImage.pas | 6 +- source/uCEFInterfaces.pas | 6 +- source/uCEFJsDialogCallback.pas | 6 +- source/uCEFJsDialogHandler.pas | 6 +- source/uCEFJson.pas | 6 +- source/uCEFKeyboardHandler.pas | 6 +- source/uCEFLabelButton.pas | 6 +- source/uCEFLabelButtonComponent.pas | 6 +- source/uCEFLayout.pas | 6 +- source/uCEFLibFunctions.pas | 6 +- source/uCEFLifeSpanHandler.pas | 2 +- source/uCEFLinkedWinControlBase.pas | 2 +- source/uCEFLinkedWindowParent.pas | 6 +- source/uCEFLinuxConstants.pas | 6 +- source/uCEFLinuxFunctions.pas | 6 +- source/uCEFListValue.pas | 6 +- source/uCEFLoadHandler.pas | 6 +- source/uCEFMacOSConstants.pas | 6 +- source/uCEFMacOSCustomCocoaTimer.pas | 6 +- source/uCEFMacOSFunctions.pas | 6 +- source/uCEFMacOSInterfaces.pas | 6 +- source/uCEFMediaObserver.pas | 6 +- source/uCEFMediaRoute.pas | 6 +- source/uCEFMediaRouteCreateCallback.pas | 6 +- source/uCEFMediaRouter.pas | 6 +- source/uCEFMediaSink.pas | 6 +- source/uCEFMediaSinkDeviceInfoCallback.pas | 6 +- source/uCEFMediaSource.pas | 6 +- source/uCEFMenuButton.pas | 6 +- source/uCEFMenuButtonComponent.pas | 6 +- source/uCEFMenuButtonDelegate.pas | 6 +- source/uCEFMenuButtonPressedLock.pas | 6 +- source/uCEFMenuModel.pas | 6 +- source/uCEFMenuModelDelegate.pas | 6 +- source/uCEFMiscFunctions.pas | 2 +- source/uCEFNavigationEntry.pas | 6 +- source/uCEFNavigationEntryVisitor.pas | 6 +- source/uCEFOsrBrowserWindow.pas | 7 +- source/uCEFOverlayController.pas | 6 +- source/uCEFPDFPrintCallback.pas | 6 +- source/uCEFPDFPrintOptions.pas | 6 +- source/uCEFPanel.pas | 6 +- source/uCEFPanelComponent.pas | 6 +- source/uCEFPanelDelegate.pas | 6 +- source/uCEFPostData.pas | 6 +- source/uCEFPostDataElement.pas | 6 +- source/uCEFPrintDialogCallback.pas | 6 +- source/uCEFPrintHandler.pas | 6 +- source/uCEFPrintJobCallback.pas | 6 +- source/uCEFPrintSettings.pas | 6 +- source/uCEFProcessMessage.pas | 6 +- source/uCEFRegistration.pas | 6 +- source/uCEFRenderHandler.pas | 6 +- source/uCEFRenderProcessHandler.pas | 6 +- source/uCEFRequest.pas | 6 +- source/uCEFRequestContext.pas | 6 +- source/uCEFRequestContextHandler.pas | 6 +- source/uCEFRequestHandler.pas | 6 +- source/uCEFResolveCallback.pas | 6 +- source/uCEFResourceBundle.pas | 6 +- source/uCEFResourceBundleHandler.pas | 6 +- source/uCEFResourceHandler.pas | 6 +- source/uCEFResourceReadCallback.pas | 6 +- source/uCEFResourceRequestHandler.pas | 6 +- source/uCEFResourceSkipCallback.pas | 6 +- source/uCEFResponse.pas | 6 +- source/uCEFResponseFilter.pas | 6 +- source/uCEFRunContextMenuCallback.pas | 6 +- source/uCEFRunFileDialogCallback.pas | 6 +- source/uCEFSSLStatus.pas | 6 +- source/uCEFSchemeHandlerFactory.pas | 6 +- source/uCEFSchemeRegistrar.pas | 6 +- source/uCEFScrollView.pas | 6 +- source/uCEFScrollViewComponent.pas | 6 +- .../uCEFSelectClientCertificateCallback.pas | 6 +- source/uCEFSentinel.pas | 6 +- source/uCEFServer.pas | 6 +- source/uCEFServerComponent.pas | 6 +- source/uCEFServerEvents.pas | 6 +- source/uCEFServerHandler.pas | 6 +- source/uCEFSetCookieCallback.pas | 6 +- source/uCEFSslInfo.pas | 6 +- source/uCEFStreamReader.pas | 6 +- source/uCEFStreamWriter.pas | 6 +- source/uCEFStringList.pas | 6 +- source/uCEFStringMap.pas | 6 +- source/uCEFStringMultimap.pas | 6 +- source/uCEFStringVisitor.pas | 6 +- source/uCEFTask.pas | 6 +- source/uCEFTaskRunner.pas | 6 +- source/uCEFTextfield.pas | 6 +- source/uCEFTextfieldComponent.pas | 6 +- source/uCEFTextfieldDelegate.pas | 6 +- source/uCEFThread.pas | 6 +- source/uCEFTimerWorkScheduler.pas | 6 +- source/uCEFTypes.pas | 7 +- source/uCEFUrlRequest.pas | 6 +- source/uCEFUrlRequestClientComponent.pas | 6 +- source/uCEFUrlRequestClientEvents.pas | 6 +- source/uCEFUrlrequestClient.pas | 6 +- source/uCEFValue.pas | 6 +- source/uCEFView.pas | 6 +- source/uCEFViewComponent.pas | 6 +- source/uCEFViewDelegate.pas | 6 +- source/uCEFViewsFrameworkEvents.pas | 6 +- source/uCEFWaitableEvent.pas | 6 +- source/uCEFWebPluginInfo.pas | 6 +- source/uCEFWebPluginInfoVisitor.pas | 6 +- source/uCEFWebPluginUnstableCallback.pas | 6 +- source/uCEFWinControl.pas | 2 +- source/uCEFWindow.pas | 6 +- source/uCEFWindowComponent.pas | 6 +- source/uCEFWindowDelegate.pas | 6 +- source/uCEFWindowParent.pas | 6 +- source/uCEFWorkScheduler.pas | 6 +- source/uCEFWorkSchedulerQueueThread.pas | 6 +- source/uCEFWorkSchedulerThread.pas | 6 +- source/uCEFWriteHandler.pas | 6 +- source/uCEFX509CertPrincipal.pas | 6 +- source/uCEFX509Certificate.pas | 6 +- source/uCEFXmlReader.pas | 6 +- source/uCEFZipReader.pas | 6 +- source/uCEFv8Accessor.pas | 6 +- source/uCEFv8ArrayBufferReleaseCallback.pas | 6 +- source/uCEFv8Context.pas | 6 +- source/uCEFv8Exception.pas | 6 +- source/uCEFv8Handler.pas | 6 +- source/uCEFv8Interceptor.pas | 6 +- source/uCEFv8StackFrame.pas | 6 +- source/uCEFv8StackTrace.pas | 6 +- source/uCEFv8Value.pas | 6 +- update_CEF4Delphi.json | 4 +- 202 files changed, 688 insertions(+), 643 deletions(-) diff --git a/README.md b/README.md index f7688b73..3bfa2997 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,16 @@ CEF4Delphi is an open source project created by Salvador Díaz Fau to embed Chro CEF4Delphi is based on DCEF3 and fpCEF3. The original license of those projects still applies to CEF4Delphi. Read the license terms in the first lines of any *.pas file. -CEF4Delphi uses CEF 98.1.21 which includes Chromium 98.0.4758.102. +CEF4Delphi uses CEF 98.2.0 which includes Chromium 98.0.4758.102. The CEF binaries used by CEF4Delphi are available for download at Spotify : -* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_windows32.tar.bz2) -* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_windows64.tar.bz2) -* [Linux x86 32 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_linux32.tar.bz2) -* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_linux64.tar.bz2) -* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_linuxarm.tar.bz2) -* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_linuxarm64.tar.bz2) -* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.1.21%2Bg9782362%2Bchromium-98.0.4758.102_macosx64.tar.bz2) +* [Windows 32 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_windows32.tar.bz2) +* [Windows 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_windows64.tar.bz2) +* [Linux x86 32 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_linux32.tar.bz2) +* [Linux x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_linux64.tar.bz2) +* [Linux ARM 32 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_linuxarm.tar.bz2) +* [Linux ARM 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_linuxarm64.tar.bz2) +* [MacOS x86 64 bits](https://cef-builds.spotifycdn.com/cef_binary_98.2.0%2Bg78c653a%2Bchromium-98.0.4758.102_macosx64.tar.bz2) CEF4Delphi was developed and tested on Delphi 11.0 and it has been tested in Delphi 7, Delphi XE, Delphi 10, Delphi 10.2, Delphi 10.3, Delphi 10.4 and Lazarus 2.2.0/FPC 3.2.2. CEF4Delphi includes VCL, FireMonkey (FMX) and Lazarus components. diff --git a/packages/cef4delphi_lazarus.lpk b/packages/cef4delphi_lazarus.lpk index 743d065e..f0e8d684 100644 --- a/packages/cef4delphi_lazarus.lpk +++ b/packages/cef4delphi_lazarus.lpk @@ -21,7 +21,7 @@ - + diff --git a/source/cef.inc b/source/cef.inc index 3ccdffce..7a181b79 100644 --- a/source/cef.inc +++ b/source/cef.inc @@ -467,11 +467,14 @@ {$DEFINE SUPPORTS_INLINE} {$ENDIF} + +// Revisar !!! +// https://docwiki.embarcadero.com/RADStudio/Sydney/en/Conditional_compilation_(Delphi) +// https://web.archive.org/web/20210711094300/https://docwiki.embarcadero.com/RADStudio/Sydney/en/Conditional_compilation_(Delphi) +// https://www.freepascal.org/docs-html/prog/progap7.html + {$IF DEFINED(CPUX32) OR - DEFINED(CPU386) OR - DEFINED(CPUi386) OR - DEFINED(CPUPOWERPC32) OR - DEFINED(CPUSPARC32) OR + DEFINED(CPU32) OR DEFINED(CPU32BITS) OR DEFINED(CPUARM32) OR DEFINED(WIN32) OR @@ -481,6 +484,19 @@ DEFINED(POSIX32) OR DEFINED(ANDROID32)} {$DEFINE TARGET_32BITS} +{$ELSE} + {$IF DEFINED(CPUX64) OR + DEFINED(CPU64) OR + DEFINED(CPU64BITS) OR + DEFINED(CPUARM64) OR + DEFINED(WIN64) OR + DEFINED(IOS64) OR + DEFINED(MACOS64) OR + DEFINED(LINUX64) OR + DEFINED(POSIX64) OR + DEFINED(ANDROID64)} + {$DEFINE TARGET_64BITS} + {$IFEND} {$IFEND} // Delphi uses MACOS for the new MacOSX and DARWIN is not defined diff --git a/source/uCEFAccessibilityHandler.pas b/source/uCEFAccessibilityHandler.pas index cbc42cdc..975b5a78 100644 --- a/source/uCEFAccessibilityHandler.pas +++ b/source/uCEFAccessibilityHandler.pas @@ -41,11 +41,11 @@ unit uCEFAccessibilityHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFApp.pas b/source/uCEFApp.pas index 14a49a3f..12816e39 100644 --- a/source/uCEFApp.pas +++ b/source/uCEFApp.pas @@ -41,11 +41,11 @@ unit uCEFApp; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFApplication.pas b/source/uCEFApplication.pas index 36988278..3b3ae098 100644 --- a/source/uCEFApplication.pas +++ b/source/uCEFApplication.pas @@ -41,11 +41,11 @@ unit uCEFApplication; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFApplicationCore.pas b/source/uCEFApplicationCore.pas index 98d36be2..d0d6e818 100644 --- a/source/uCEFApplicationCore.pas +++ b/source/uCEFApplicationCore.pas @@ -41,11 +41,11 @@ unit uCEFApplicationCore; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + {$IFNDEF FPC}{$IFNDEF DELPHI12_UP} // Workaround for "Internal error" in old Delphi versions caused by uint64 handling {$R-} @@ -67,8 +67,8 @@ uses const CEF_SUPPORTED_VERSION_MAJOR = 98; - CEF_SUPPORTED_VERSION_MINOR = 1; - CEF_SUPPORTED_VERSION_RELEASE = 21; + CEF_SUPPORTED_VERSION_MINOR = 2; + CEF_SUPPORTED_VERSION_RELEASE = 0; CEF_SUPPORTED_VERSION_BUILD = 0; CEF_CHROMEELF_VERSION_MAJOR = 98; @@ -353,6 +353,7 @@ type procedure ShutDown; procedure FreeLibcefLibrary; function ExecuteProcess(const aApp : ICefApp) : integer; + procedure InitializeCefMainArgs(var aCefMainArgs : TCefMainArgs); procedure InitializeSettings(var aSettings : TCefSettings); function InitializeLibrary(const aApp : ICefApp) : boolean; procedure RenameAndDeleteDir(const aDirectory : string; aKeepCookies : boolean = False); @@ -1345,6 +1346,41 @@ begin end; end; +{$WARN SYMBOL_PLATFORM OFF} +procedure TCefApplicationCore.InitializeCefMainArgs(var aCefMainArgs : TCefMainArgs); +begin + {$IFDEF MSWINDOWS} + aCefMainArgs.instance := HINSTANCE{$IFDEF FPC}(){$ENDIF}; + {$ENDIF} + + {$IFDEF LINUX} + {$IFDEF FPC} + // Create a copy of argv on Linux because Chromium mangles the value internally (see CEF issue #620). + // https://bitbucket.org/chromiumembedded/cef/issues/620/cef3-linux-crash-when-passing-command-line + if (FArgCopy.argv = nil) then + FArgCopy.CopyFromArgs(argc, argv); + + aCefMainArgs.argc := FArgCopy.argc; + aCefMainArgs.argv := FArgCopy.argv; + {$ELSE} + // TO-DO: FMX should also copy argv to FArgCopy like FPC + aCefMainArgs.argc := ArgCount; + aCefMainArgs.argv := PPWideChar(ArgValues); + {$ENDIF} + {$ENDIF} + + {$IFDEF MACOSX} + {$IFDEF FPC} + aCefMainArgs.argc := argc; + aCefMainArgs.argv := argv; + {$ELSE} + aCefMainArgs.argc := ArgCount; + aCefMainArgs.argv := PPWideChar(ArgValues); + {$ENDIF} + {$ENDIF} +end; +{$WARN SYMBOL_PLATFORM ON} + function TCefApplicationCore.ExecuteProcess(const aApp : ICefApp) : integer; var TempArgs : TCefMainArgs; @@ -1353,22 +1389,7 @@ begin try if (aApp <> nil) then begin - {$WARN SYMBOL_PLATFORM OFF} - {$IFDEF MSWINDOWS} - TempArgs.instance := HINSTANCE{$IFDEF FPC}(){$ENDIF}; - {$ELSE} - {$IFDEF FPC} - {$IFDEF LINUX} - FArgCopy.CopyFromArgs(argc, argv); - {$ENDIF} - TempArgs.argc := argc; - TempArgs.argv := argv; - {$ELSE} - TempArgs.argc := ArgCount; - TempArgs.argv := PPWideChar(ArgValues); - {$ENDIF} - {$ENDIF} - {$WARN SYMBOL_PLATFORM ON} + InitializeCefMainArgs(TempArgs); Result := cef_execute_process(@TempArgs, aApp.Wrap, FWindowsSandboxInfo); end; except @@ -1435,20 +1456,7 @@ begin RenameAndDeleteDir(FCache, True); InitializeSettings(FAppSettings); - - {$IFDEF MSWINDOWS} - TempArgs.instance := HINSTANCE{$IFDEF FPC}(){$ENDIF}; - {$ELSE} - {$WARN SYMBOL_PLATFORM OFF} - {$IFDEF FPC} - TempArgs.argc := argc; - TempArgs.argv := argv; - {$ELSE} - TempArgs.argc := ArgCount; - TempArgs.argv := PPWideChar(ArgValues); - {$ENDIF} - {$WARN SYMBOL_PLATFORM ON} - {$ENDIF} + InitializeCefMainArgs(TempArgs); if (cef_initialize(@TempArgs, @FAppSettings, aApp.Wrap, FWindowsSandboxInfo) <> 0) then begin diff --git a/source/uCEFArgCopy.pas b/source/uCEFArgCopy.pas index f775f229..f86fbc1e 100644 --- a/source/uCEFArgCopy.pas +++ b/source/uCEFArgCopy.pas @@ -41,7 +41,7 @@ unit uCEFArgCopy; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} {$MINENUMSIZE 4} {$I cef.inc} diff --git a/source/uCEFAudioHandler.pas b/source/uCEFAudioHandler.pas index 35b17f89..ac7ae65f 100644 --- a/source/uCEFAudioHandler.pas +++ b/source/uCEFAudioHandler.pas @@ -41,11 +41,11 @@ unit uCEFAudioHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFAuthCallback.pas b/source/uCEFAuthCallback.pas index ed80a0d2..1f52e670 100644 --- a/source/uCEFAuthCallback.pas +++ b/source/uCEFAuthCallback.pas @@ -41,11 +41,11 @@ unit uCEFAuthCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBaseRefCounted.pas b/source/uCEFBaseRefCounted.pas index bfd0512f..dc3642bc 100644 --- a/source/uCEFBaseRefCounted.pas +++ b/source/uCEFBaseRefCounted.pas @@ -41,11 +41,11 @@ unit uCEFBaseRefCounted; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBaseScopedWrapper.pas b/source/uCEFBaseScopedWrapper.pas index 28b4f66c..63cd0879 100644 --- a/source/uCEFBaseScopedWrapper.pas +++ b/source/uCEFBaseScopedWrapper.pas @@ -41,11 +41,11 @@ unit uCEFBaseScopedWrapper; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface type diff --git a/source/uCEFBeforeDownloadCallback.pas b/source/uCEFBeforeDownloadCallback.pas index d54c9f76..97fcf677 100644 --- a/source/uCEFBeforeDownloadCallback.pas +++ b/source/uCEFBeforeDownloadCallback.pas @@ -41,11 +41,11 @@ unit uCEFBeforeDownloadCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBinaryValue.pas b/source/uCEFBinaryValue.pas index 0dc34cb7..06e87177 100644 --- a/source/uCEFBinaryValue.pas +++ b/source/uCEFBinaryValue.pas @@ -41,11 +41,11 @@ unit uCEFBinaryValue; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBitmapBitBuffer.pas b/source/uCEFBitmapBitBuffer.pas index 66055f85..255cb7b8 100644 --- a/source/uCEFBitmapBitBuffer.pas +++ b/source/uCEFBitmapBitBuffer.pas @@ -41,11 +41,11 @@ unit uCEFBitmapBitBuffer; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBoxLayout.pas b/source/uCEFBoxLayout.pas index acccd0c1..0a5d0ce8 100644 --- a/source/uCEFBoxLayout.pas +++ b/source/uCEFBoxLayout.pas @@ -41,11 +41,11 @@ unit uCEFBoxLayout; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBrowser.pas b/source/uCEFBrowser.pas index edba9eda..2b4bd9c0 100644 --- a/source/uCEFBrowser.pas +++ b/source/uCEFBrowser.pas @@ -41,11 +41,11 @@ unit uCEFBrowser; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBrowserProcessHandler.pas b/source/uCEFBrowserProcessHandler.pas index a810a855..7d3e2388 100644 --- a/source/uCEFBrowserProcessHandler.pas +++ b/source/uCEFBrowserProcessHandler.pas @@ -41,11 +41,11 @@ unit uCEFBrowserProcessHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBrowserView.pas b/source/uCEFBrowserView.pas index ab92d998..bf16bcac 100644 --- a/source/uCEFBrowserView.pas +++ b/source/uCEFBrowserView.pas @@ -41,11 +41,11 @@ unit uCEFBrowserView; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBrowserViewComponent.pas b/source/uCEFBrowserViewComponent.pas index 737e0cec..fb4d912d 100644 --- a/source/uCEFBrowserViewComponent.pas +++ b/source/uCEFBrowserViewComponent.pas @@ -41,11 +41,11 @@ unit uCEFBrowserViewComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFBrowserViewDelegate.pas b/source/uCEFBrowserViewDelegate.pas index b6f7a305..ea805e6f 100644 --- a/source/uCEFBrowserViewDelegate.pas +++ b/source/uCEFBrowserViewDelegate.pas @@ -41,11 +41,11 @@ unit uCEFBrowserViewDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFButton.pas b/source/uCEFButton.pas index 224e2e0c..be027556 100644 --- a/source/uCEFButton.pas +++ b/source/uCEFButton.pas @@ -41,11 +41,11 @@ unit uCEFButton; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFButtonComponent.pas b/source/uCEFButtonComponent.pas index f2a325d0..52e4ce71 100644 --- a/source/uCEFButtonComponent.pas +++ b/source/uCEFButtonComponent.pas @@ -41,11 +41,11 @@ unit uCEFButtonComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFButtonDelegate.pas b/source/uCEFButtonDelegate.pas index 898f1e5b..b1597a24 100644 --- a/source/uCEFButtonDelegate.pas +++ b/source/uCEFButtonDelegate.pas @@ -41,11 +41,11 @@ unit uCEFButtonDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCallback.pas b/source/uCEFCallback.pas index 1347203b..9c7fbd32 100644 --- a/source/uCEFCallback.pas +++ b/source/uCEFCallback.pas @@ -41,11 +41,11 @@ unit uCEFCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFChromium.pas b/source/uCEFChromium.pas index 5463a9b6..b438ed1c 100644 --- a/source/uCEFChromium.pas +++ b/source/uCEFChromium.pas @@ -41,11 +41,11 @@ unit uCEFChromium; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFChromiumCore.pas b/source/uCEFChromiumCore.pas index 37eaf526..13024540 100644 --- a/source/uCEFChromiumCore.pas +++ b/source/uCEFChromiumCore.pas @@ -41,11 +41,11 @@ unit uCEFChromiumCore; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses @@ -418,6 +418,7 @@ type procedure SetQuicAllowed(aValue : boolean); procedure SetJavascriptEnabled(aValue : boolean); procedure SetLoadImagesAutomatically(aValue : boolean); + procedure SetDefaultUrl(const aValue : ustring); function CreateBrowserHost(aWindowInfo : PCefWindowInfo; const aURL : ustring; const aSettings : PCefBrowserSettings; const aExtraInfo : ICefDictionaryValue; const aContext : ICefRequestContext): boolean; function CreateBrowserHostSync(aWindowInfo : PCefWindowInfo; const aURL : ustring; const aSettings : PCefBrowserSettings; const aExtraInfo : ICefDictionaryValue; const aContext : ICefRequestContext): Boolean; @@ -862,7 +863,7 @@ type function GetExtensions(const extension_ids: TStringList): boolean; function GetExtension(const extension_id: ustring): ICefExtension; - property DefaultUrl : ustring read FDefaultUrl write FDefaultUrl; + property DefaultUrl : ustring read FDefaultUrl write SetDefaultUrl; property Options : TChromiumOptions read FOptions write FOptions; property FontOptions : TChromiumFontOptions read FFontOptions write FFontOptions; property PDFPrintOptions : TPDFPrintOptions read FPDFPrintOptions write FPDFPrintOptions; @@ -1237,7 +1238,7 @@ begin FCompHandle := 0; {$ENDIF} FIsOSR := False; - FDefaultUrl := 'about:blank'; + FDefaultUrl := ABOUTBLANK_URI; FHandler := nil; FReqContextHandler := nil; FResourceRequestHandler := nil; @@ -2846,6 +2847,16 @@ begin end; end; +procedure TChromiumCore.SetDefaultUrl(const aValue : ustring); +begin + FDefaultUrl := trim(aValue); + + // Use 'about:blank' if FDefaultUrl is empty to avoid a memory leak when the browser is destroyed. + // https://github.com/salvadordf/CEF4Delphi/issues/404 + if (Length(FDefaultUrl) = 0) then + FDefaultUrl := ABOUTBLANK_URI; +end; + procedure TChromiumCore.SetAudioMuted(aValue : boolean); begin if Initialized then diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas index bf238387..e1e5b0e9 100644 --- a/source/uCEFChromiumEvents.pas +++ b/source/uCEFChromiumEvents.pas @@ -41,11 +41,11 @@ unit uCEFChromiumEvents; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFChromiumFontOptions.pas b/source/uCEFChromiumFontOptions.pas index 51302556..c9ac9855 100644 --- a/source/uCEFChromiumFontOptions.pas +++ b/source/uCEFChromiumFontOptions.pas @@ -41,11 +41,11 @@ unit uCEFChromiumFontOptions; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFChromiumOptions.pas b/source/uCEFChromiumOptions.pas index 2edb3d53..e6105a1f 100644 --- a/source/uCEFChromiumOptions.pas +++ b/source/uCEFChromiumOptions.pas @@ -41,11 +41,11 @@ unit uCEFChromiumOptions; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFChromiumWindow.pas b/source/uCEFChromiumWindow.pas index a50eb1bc..396a6790 100644 --- a/source/uCEFChromiumWindow.pas +++ b/source/uCEFChromiumWindow.pas @@ -41,11 +41,11 @@ unit uCEFChromiumWindow; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFClient.pas b/source/uCEFClient.pas index 17fc2ed4..0083f64b 100644 --- a/source/uCEFClient.pas +++ b/source/uCEFClient.pas @@ -41,11 +41,11 @@ unit uCEFClient; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCommandLine.pas b/source/uCEFCommandLine.pas index 5ded192f..025be65b 100644 --- a/source/uCEFCommandLine.pas +++ b/source/uCEFCommandLine.pas @@ -41,11 +41,11 @@ unit uCEFCommandLine; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCompletionCallback.pas b/source/uCEFCompletionCallback.pas index db512566..5ff599a0 100644 --- a/source/uCEFCompletionCallback.pas +++ b/source/uCEFCompletionCallback.pas @@ -41,11 +41,11 @@ unit uCEFCompletionCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFConstants.pas b/source/uCEFConstants.pas index 62724480..12f309e1 100644 --- a/source/uCEFConstants.pas +++ b/source/uCEFConstants.pas @@ -41,11 +41,11 @@ unit uCEFConstants; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface {$IFDEF MSWINDOWS} @@ -519,17 +519,20 @@ const CM_TYPEFLAG_EDITABLE = 1 shl 5; // /include/internal/cef_types.h (cef_context_menu_media_state_flags_t) - CM_MEDIAFLAG_NONE = 0; - CM_MEDIAFLAG_ERROR = 1 shl 0; - CM_MEDIAFLAG_PAUSED = 1 shl 1; - CM_MEDIAFLAG_MUTED = 1 shl 2; - CM_MEDIAFLAG_LOOP = 1 shl 3; - CM_MEDIAFLAG_CAN_SAVE = 1 shl 4; - CM_MEDIAFLAG_HAS_AUDIO = 1 shl 5; - CM_MEDIAFLAG_HAS_VIDEO = 1 shl 6; - CM_MEDIAFLAG_CONTROL_ROOT_ELEMENT = 1 shl 7; - CM_MEDIAFLAG_CAN_PRINT = 1 shl 8; - CM_MEDIAFLAG_CAN_ROTATE = 1 shl 9; + CM_MEDIAFLAG_NONE = 0; + CM_MEDIAFLAG_IN_ERROR = 1 shl 0; + CM_MEDIAFLAG_PAUSED = 1 shl 1; + CM_MEDIAFLAG_MUTED = 1 shl 2; + CM_MEDIAFLAG_LOOP = 1 shl 3; + CM_MEDIAFLAG_CAN_SAVE = 1 shl 4; + CM_MEDIAFLAG_HAS_AUDIO = 1 shl 5; + CM_MEDIAFLAG_CAN_TOGGLE_CONTROLS = 1 shl 6; + CM_MEDIAFLAG_CONTROLS = 1 shl 7; + CM_MEDIAFLAG_CAN_PRINT = 1 shl 8; + CM_MEDIAFLAG_CAN_ROTATE = 1 shl 9; + CM_MEDIAFLAG_CAN_PICTURE_IN_PICTURE = 1 shl 10; + CM_MEDIAFLAG_PICTURE_IN_PICTURE = 1 shl 11; + CM_MEDIAFLAG_CAN_LOOP = 1 shl 12; // /include/internal/cef_types.h (cef_context_menu_edit_state_flags_t) CM_EDITFLAG_NONE = 0; @@ -541,6 +544,7 @@ const CM_EDITFLAG_CAN_DELETE = 1 shl 5; CM_EDITFLAG_CAN_SELECT_ALL = 1 shl 6; CM_EDITFLAG_CAN_TRANSLATE = 1 shl 7; + CM_EDITFLAG_CAN_EDIT_RICHLY = 1 shl 8; // /include/internal/cef_types.h (cef_ssl_version_t) SSL_CONNECTION_VERSION_UNKNOWN = 0; @@ -633,6 +637,8 @@ const //****************** OTHER CONSTANTS ******************* //****************************************************** + ABOUTBLANK_URI = 'about:blank'; + DEVTOOLS_WINDOWNAME = 'DevTools'; CEF_PROXYTYPE_DIRECT = 0; diff --git a/source/uCEFContextMenuHandler.pas b/source/uCEFContextMenuHandler.pas index e4189ab3..099dab4b 100644 --- a/source/uCEFContextMenuHandler.pas +++ b/source/uCEFContextMenuHandler.pas @@ -41,11 +41,11 @@ unit uCEFContextMenuHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFContextMenuParams.pas b/source/uCEFContextMenuParams.pas index e1e7b6a5..fa8c1c55 100644 --- a/source/uCEFContextMenuParams.pas +++ b/source/uCEFContextMenuParams.pas @@ -41,11 +41,11 @@ unit uCEFContextMenuParams; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCookieAccessFilter.pas b/source/uCEFCookieAccessFilter.pas index 71f0c4fa..d8253692 100644 --- a/source/uCEFCookieAccessFilter.pas +++ b/source/uCEFCookieAccessFilter.pas @@ -41,11 +41,11 @@ unit uCEFCookieAccessFilter; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCookieManager.pas b/source/uCEFCookieManager.pas index 710f9973..1ae2fb3b 100644 --- a/source/uCEFCookieManager.pas +++ b/source/uCEFCookieManager.pas @@ -41,11 +41,11 @@ unit uCEFCookieManager; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCookieVisitor.pas b/source/uCEFCookieVisitor.pas index f5e3ed2c..b9dfb873 100644 --- a/source/uCEFCookieVisitor.pas +++ b/source/uCEFCookieVisitor.pas @@ -41,11 +41,11 @@ unit uCEFCookieVisitor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFCustomStreamReader.pas b/source/uCEFCustomStreamReader.pas index 77bb20e7..7aa131b8 100644 --- a/source/uCEFCustomStreamReader.pas +++ b/source/uCEFCustomStreamReader.pas @@ -41,11 +41,11 @@ unit uCEFCustomStreamReader; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDeleteCookiesCallback.pas b/source/uCEFDeleteCookiesCallback.pas index 74faa23a..23599ee4 100644 --- a/source/uCEFDeleteCookiesCallback.pas +++ b/source/uCEFDeleteCookiesCallback.pas @@ -41,11 +41,11 @@ unit uCEFDeleteCookiesCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDevToolsMessageObserver.pas b/source/uCEFDevToolsMessageObserver.pas index 2562a07d..c905d9f7 100644 --- a/source/uCEFDevToolsMessageObserver.pas +++ b/source/uCEFDevToolsMessageObserver.pas @@ -41,11 +41,11 @@ unit uCEFDevToolsMessageObserver; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDialogHandler.pas b/source/uCEFDialogHandler.pas index fb0c8302..d80806cb 100644 --- a/source/uCEFDialogHandler.pas +++ b/source/uCEFDialogHandler.pas @@ -41,11 +41,11 @@ unit uCEFDialogHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDictionaryValue.pas b/source/uCEFDictionaryValue.pas index 59b2460e..bb0b8d66 100644 --- a/source/uCEFDictionaryValue.pas +++ b/source/uCEFDictionaryValue.pas @@ -41,11 +41,11 @@ unit uCEFDictionaryValue; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDisplay.pas b/source/uCEFDisplay.pas index c90ab8e4..b7c4af4c 100644 --- a/source/uCEFDisplay.pas +++ b/source/uCEFDisplay.pas @@ -41,11 +41,11 @@ unit uCEFDisplay; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDisplayHandler.pas b/source/uCEFDisplayHandler.pas index 4ed99c08..7c5dd80f 100644 --- a/source/uCEFDisplayHandler.pas +++ b/source/uCEFDisplayHandler.pas @@ -41,11 +41,11 @@ unit uCEFDisplayHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDomDocument.pas b/source/uCEFDomDocument.pas index eee59c2d..2fc39dfe 100644 --- a/source/uCEFDomDocument.pas +++ b/source/uCEFDomDocument.pas @@ -41,11 +41,11 @@ unit uCEFDomDocument; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDomNode.pas b/source/uCEFDomNode.pas index e63e7135..9fe1d959 100644 --- a/source/uCEFDomNode.pas +++ b/source/uCEFDomNode.pas @@ -41,11 +41,11 @@ unit uCEFDomNode; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDomVisitor.pas b/source/uCEFDomVisitor.pas index a2db9af0..29d0f491 100644 --- a/source/uCEFDomVisitor.pas +++ b/source/uCEFDomVisitor.pas @@ -41,11 +41,11 @@ unit uCEFDomVisitor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDownLoadItem.pas b/source/uCEFDownLoadItem.pas index f81167a3..e822e6ce 100644 --- a/source/uCEFDownLoadItem.pas +++ b/source/uCEFDownLoadItem.pas @@ -41,11 +41,11 @@ unit uCEFDownLoadItem; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDownloadHandler.pas b/source/uCEFDownloadHandler.pas index 9844c92e..15058c21 100644 --- a/source/uCEFDownloadHandler.pas +++ b/source/uCEFDownloadHandler.pas @@ -41,11 +41,11 @@ unit uCEFDownloadHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDownloadImageCallBack.pas b/source/uCEFDownloadImageCallBack.pas index cf639349..19a8dbdf 100644 --- a/source/uCEFDownloadImageCallBack.pas +++ b/source/uCEFDownloadImageCallBack.pas @@ -41,11 +41,11 @@ unit uCEFDownloadImageCallBack; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDownloadItemCallback.pas b/source/uCEFDownloadItemCallback.pas index 2b972e6e..e85b26d4 100644 --- a/source/uCEFDownloadItemCallback.pas +++ b/source/uCEFDownloadItemCallback.pas @@ -41,11 +41,11 @@ unit uCEFDownloadItemCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDragData.pas b/source/uCEFDragData.pas index 95941f96..1baa3103 100644 --- a/source/uCEFDragData.pas +++ b/source/uCEFDragData.pas @@ -41,11 +41,11 @@ unit uCEFDragData; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFDragHandler.pas b/source/uCEFDragHandler.pas index ab7fe906..8d316a06 100644 --- a/source/uCEFDragHandler.pas +++ b/source/uCEFDragHandler.pas @@ -41,11 +41,11 @@ unit uCEFDragHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFEndTracingCallback.pas b/source/uCEFEndTracingCallback.pas index dc82f1af..dbdbc319 100644 --- a/source/uCEFEndTracingCallback.pas +++ b/source/uCEFEndTracingCallback.pas @@ -41,11 +41,11 @@ unit uCEFEndTracingCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFExtension.pas b/source/uCEFExtension.pas index a8d1b304..1b9ad546 100644 --- a/source/uCEFExtension.pas +++ b/source/uCEFExtension.pas @@ -41,11 +41,11 @@ unit uCEFExtension; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFExtensionHandler.pas b/source/uCEFExtensionHandler.pas index 212b4e2b..f92e871f 100644 --- a/source/uCEFExtensionHandler.pas +++ b/source/uCEFExtensionHandler.pas @@ -41,11 +41,11 @@ unit uCEFExtensionHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFMXChromium.pas b/source/uCEFFMXChromium.pas index 8fc4d66c..5a91ac57 100644 --- a/source/uCEFFMXChromium.pas +++ b/source/uCEFFMXChromium.pas @@ -37,11 +37,11 @@ unit uCEFFMXChromium; -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFMXWindowParent.pas b/source/uCEFFMXWindowParent.pas index 54394ebc..50cd7300 100644 --- a/source/uCEFFMXWindowParent.pas +++ b/source/uCEFFMXWindowParent.pas @@ -37,11 +37,11 @@ unit uCEFFMXWindowParent; -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFMXWorkScheduler.pas b/source/uCEFFMXWorkScheduler.pas index 503b6df4..5170e462 100644 --- a/source/uCEFFMXWorkScheduler.pas +++ b/source/uCEFFMXWorkScheduler.pas @@ -37,11 +37,11 @@ unit uCEFFMXWorkScheduler; -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFileDialogCallback.pas b/source/uCEFFileDialogCallback.pas index e00a29a6..f7213f9a 100644 --- a/source/uCEFFileDialogCallback.pas +++ b/source/uCEFFileDialogCallback.pas @@ -41,11 +41,11 @@ unit uCEFFileDialogCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFileDialogInfo.pas b/source/uCEFFileDialogInfo.pas index 32ca3937..534e973e 100644 --- a/source/uCEFFileDialogInfo.pas +++ b/source/uCEFFileDialogInfo.pas @@ -41,11 +41,11 @@ unit uCEFFileDialogInfo; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFillLayout.pas b/source/uCEFFillLayout.pas index 4f92092b..e4e56811 100644 --- a/source/uCEFFillLayout.pas +++ b/source/uCEFFillLayout.pas @@ -41,11 +41,11 @@ unit uCEFFillLayout; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFindHandler.pas b/source/uCEFFindHandler.pas index e0cf7192..dd0db56d 100644 --- a/source/uCEFFindHandler.pas +++ b/source/uCEFFindHandler.pas @@ -41,11 +41,11 @@ unit uCEFFindHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFocusHandler.pas b/source/uCEFFocusHandler.pas index 1f707f89..b1951af9 100644 --- a/source/uCEFFocusHandler.pas +++ b/source/uCEFFocusHandler.pas @@ -41,11 +41,11 @@ unit uCEFFocusHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFrame.pas b/source/uCEFFrame.pas index f19a7b5a..1ecb7439 100644 --- a/source/uCEFFrame.pas +++ b/source/uCEFFrame.pas @@ -41,11 +41,11 @@ unit uCEFFrame; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFFrameHandler.pas b/source/uCEFFrameHandler.pas index 7ecffb68..48c12be4 100644 --- a/source/uCEFFrameHandler.pas +++ b/source/uCEFFrameHandler.pas @@ -41,11 +41,11 @@ unit uCEFFrameHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFGetExtensionResourceCallback.pas b/source/uCEFGetExtensionResourceCallback.pas index ed2fa43c..402e918d 100644 --- a/source/uCEFGetExtensionResourceCallback.pas +++ b/source/uCEFGetExtensionResourceCallback.pas @@ -41,11 +41,11 @@ unit uCEFGetExtensionResourceCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFImage.pas b/source/uCEFImage.pas index 9372032b..e8acdcd7 100644 --- a/source/uCEFImage.pas +++ b/source/uCEFImage.pas @@ -41,11 +41,11 @@ unit uCEFImage; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index a56b50a5..5e0f9850 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -41,11 +41,11 @@ unit uCEFInterfaces; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFJsDialogCallback.pas b/source/uCEFJsDialogCallback.pas index 8caa8049..559bdf97 100644 --- a/source/uCEFJsDialogCallback.pas +++ b/source/uCEFJsDialogCallback.pas @@ -41,11 +41,11 @@ unit uCEFJsDialogCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFJsDialogHandler.pas b/source/uCEFJsDialogHandler.pas index 97904b6e..39ff4d7b 100644 --- a/source/uCEFJsDialogHandler.pas +++ b/source/uCEFJsDialogHandler.pas @@ -41,11 +41,11 @@ unit uCEFJsDialogHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFJson.pas b/source/uCEFJson.pas index b73f5625..a0c4e0b1 100644 --- a/source/uCEFJson.pas +++ b/source/uCEFJson.pas @@ -41,11 +41,11 @@ unit uCEFJson; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFKeyboardHandler.pas b/source/uCEFKeyboardHandler.pas index e064e222..f9c01273 100644 --- a/source/uCEFKeyboardHandler.pas +++ b/source/uCEFKeyboardHandler.pas @@ -41,11 +41,11 @@ unit uCEFKeyboardHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLabelButton.pas b/source/uCEFLabelButton.pas index 104cbc45..6e391e79 100644 --- a/source/uCEFLabelButton.pas +++ b/source/uCEFLabelButton.pas @@ -41,11 +41,11 @@ unit uCEFLabelButton; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLabelButtonComponent.pas b/source/uCEFLabelButtonComponent.pas index 6407f3e1..37805d3e 100644 --- a/source/uCEFLabelButtonComponent.pas +++ b/source/uCEFLabelButtonComponent.pas @@ -41,11 +41,11 @@ unit uCEFLabelButtonComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLayout.pas b/source/uCEFLayout.pas index 582a8385..c02da008 100644 --- a/source/uCEFLayout.pas +++ b/source/uCEFLayout.pas @@ -41,11 +41,11 @@ unit uCEFLayout; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLibFunctions.pas b/source/uCEFLibFunctions.pas index c0bf3db0..4c5c08ba 100644 --- a/source/uCEFLibFunctions.pas +++ b/source/uCEFLibFunctions.pas @@ -41,11 +41,11 @@ unit uCEFLibFunctions; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLifeSpanHandler.pas b/source/uCEFLifeSpanHandler.pas index 52f78b9d..839b8c58 100644 --- a/source/uCEFLifeSpanHandler.pas +++ b/source/uCEFLifeSpanHandler.pas @@ -41,7 +41,7 @@ unit uCEFLifeSpanHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} {$MINENUMSIZE 4} {$I cef.inc} diff --git a/source/uCEFLinkedWinControlBase.pas b/source/uCEFLinkedWinControlBase.pas index ed80dcd7..2a4ae1e6 100644 --- a/source/uCEFLinkedWinControlBase.pas +++ b/source/uCEFLinkedWinControlBase.pas @@ -46,7 +46,7 @@ unit uCEFLinkedWinControlBase; {$ENDIF} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} {$MINENUMSIZE 4} interface diff --git a/source/uCEFLinkedWindowParent.pas b/source/uCEFLinkedWindowParent.pas index fc2d7d91..cc07f8aa 100644 --- a/source/uCEFLinkedWindowParent.pas +++ b/source/uCEFLinkedWindowParent.pas @@ -41,11 +41,11 @@ unit uCEFLinkedWindowParent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLinuxConstants.pas b/source/uCEFLinuxConstants.pas index d51771b1..4735be8a 100644 --- a/source/uCEFLinuxConstants.pas +++ b/source/uCEFLinuxConstants.pas @@ -41,11 +41,11 @@ unit uCEFLinuxConstants; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface {$IFDEF LINUX} diff --git a/source/uCEFLinuxFunctions.pas b/source/uCEFLinuxFunctions.pas index 7437e612..536c831b 100644 --- a/source/uCEFLinuxFunctions.pas +++ b/source/uCEFLinuxFunctions.pas @@ -41,11 +41,11 @@ unit uCEFLinuxFunctions; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFListValue.pas b/source/uCEFListValue.pas index 025739b9..678d2465 100644 --- a/source/uCEFListValue.pas +++ b/source/uCEFListValue.pas @@ -41,11 +41,11 @@ unit uCEFListValue; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFLoadHandler.pas b/source/uCEFLoadHandler.pas index 6b56db26..badd8a81 100644 --- a/source/uCEFLoadHandler.pas +++ b/source/uCEFLoadHandler.pas @@ -41,11 +41,11 @@ unit uCEFLoadHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMacOSConstants.pas b/source/uCEFMacOSConstants.pas index 7f6325e7..f2b7e22d 100644 --- a/source/uCEFMacOSConstants.pas +++ b/source/uCEFMacOSConstants.pas @@ -41,11 +41,11 @@ unit uCEFMacOSConstants; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface {$IFDEF MACOSX} diff --git a/source/uCEFMacOSCustomCocoaTimer.pas b/source/uCEFMacOSCustomCocoaTimer.pas index 184a9590..503febb3 100644 --- a/source/uCEFMacOSCustomCocoaTimer.pas +++ b/source/uCEFMacOSCustomCocoaTimer.pas @@ -41,11 +41,11 @@ unit uCEFMacOSCustomCocoaTimer; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface {$IFDEF MACOS} diff --git a/source/uCEFMacOSFunctions.pas b/source/uCEFMacOSFunctions.pas index 66154f67..775ecaa9 100644 --- a/source/uCEFMacOSFunctions.pas +++ b/source/uCEFMacOSFunctions.pas @@ -41,11 +41,11 @@ unit uCEFMacOSFunctions; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMacOSInterfaces.pas b/source/uCEFMacOSInterfaces.pas index 8e0ef396..cdb2b182 100644 --- a/source/uCEFMacOSInterfaces.pas +++ b/source/uCEFMacOSInterfaces.pas @@ -41,11 +41,11 @@ unit uCEFMacOSInterfaces; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface {$IFDEF MACOS} diff --git a/source/uCEFMediaObserver.pas b/source/uCEFMediaObserver.pas index 0a7f381a..1ef4464b 100644 --- a/source/uCEFMediaObserver.pas +++ b/source/uCEFMediaObserver.pas @@ -41,11 +41,11 @@ unit uCEFMediaObserver; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMediaRoute.pas b/source/uCEFMediaRoute.pas index 13d28797..5e33ee47 100644 --- a/source/uCEFMediaRoute.pas +++ b/source/uCEFMediaRoute.pas @@ -41,11 +41,11 @@ unit uCEFMediaRoute; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMediaRouteCreateCallback.pas b/source/uCEFMediaRouteCreateCallback.pas index 20c8677e..2a728725 100644 --- a/source/uCEFMediaRouteCreateCallback.pas +++ b/source/uCEFMediaRouteCreateCallback.pas @@ -41,11 +41,11 @@ unit uCEFMediaRouteCreateCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMediaRouter.pas b/source/uCEFMediaRouter.pas index d1e6b907..b29b2fe9 100644 --- a/source/uCEFMediaRouter.pas +++ b/source/uCEFMediaRouter.pas @@ -41,11 +41,11 @@ unit uCEFMediaRouter; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMediaSink.pas b/source/uCEFMediaSink.pas index 5dfba253..29b20b19 100644 --- a/source/uCEFMediaSink.pas +++ b/source/uCEFMediaSink.pas @@ -41,11 +41,11 @@ unit uCEFMediaSink; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMediaSinkDeviceInfoCallback.pas b/source/uCEFMediaSinkDeviceInfoCallback.pas index 3750f385..999f4d84 100644 --- a/source/uCEFMediaSinkDeviceInfoCallback.pas +++ b/source/uCEFMediaSinkDeviceInfoCallback.pas @@ -41,11 +41,11 @@ unit uCEFMediaSinkDeviceInfoCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMediaSource.pas b/source/uCEFMediaSource.pas index 6c6c6f96..4a887264 100644 --- a/source/uCEFMediaSource.pas +++ b/source/uCEFMediaSource.pas @@ -41,11 +41,11 @@ unit uCEFMediaSource; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMenuButton.pas b/source/uCEFMenuButton.pas index 050404dc..6d77a076 100644 --- a/source/uCEFMenuButton.pas +++ b/source/uCEFMenuButton.pas @@ -41,11 +41,11 @@ unit uCEFMenuButton; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMenuButtonComponent.pas b/source/uCEFMenuButtonComponent.pas index d06a7679..a811deb6 100644 --- a/source/uCEFMenuButtonComponent.pas +++ b/source/uCEFMenuButtonComponent.pas @@ -41,11 +41,11 @@ unit uCEFMenuButtonComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMenuButtonDelegate.pas b/source/uCEFMenuButtonDelegate.pas index 5307ed14..a7286eb0 100644 --- a/source/uCEFMenuButtonDelegate.pas +++ b/source/uCEFMenuButtonDelegate.pas @@ -41,11 +41,11 @@ unit uCEFMenuButtonDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMenuButtonPressedLock.pas b/source/uCEFMenuButtonPressedLock.pas index ff15321e..d1c3652f 100644 --- a/source/uCEFMenuButtonPressedLock.pas +++ b/source/uCEFMenuButtonPressedLock.pas @@ -41,11 +41,11 @@ unit uCEFMenuButtonPressedLock; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMenuModel.pas b/source/uCEFMenuModel.pas index 465a0329..8aafe569 100644 --- a/source/uCEFMenuModel.pas +++ b/source/uCEFMenuModel.pas @@ -41,11 +41,11 @@ unit uCEFMenuModel; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMenuModelDelegate.pas b/source/uCEFMenuModelDelegate.pas index b0fa7bfa..2c1b7aa6 100644 --- a/source/uCEFMenuModelDelegate.pas +++ b/source/uCEFMenuModelDelegate.pas @@ -41,11 +41,11 @@ unit uCEFMenuModelDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFMiscFunctions.pas b/source/uCEFMiscFunctions.pas index b6cea743..676472a4 100644 --- a/source/uCEFMiscFunctions.pas +++ b/source/uCEFMiscFunctions.pas @@ -46,7 +46,7 @@ unit uCEFMiscFunctions; {$ENDIF} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} {$MINENUMSIZE 4} {$IFNDEF FPC}{$IFNDEF DELPHI12_UP} diff --git a/source/uCEFNavigationEntry.pas b/source/uCEFNavigationEntry.pas index 725c83a2..370d6fef 100644 --- a/source/uCEFNavigationEntry.pas +++ b/source/uCEFNavigationEntry.pas @@ -41,11 +41,11 @@ unit uCEFNavigationEntry; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFNavigationEntryVisitor.pas b/source/uCEFNavigationEntryVisitor.pas index 8f3f83ea..b63c44a2 100644 --- a/source/uCEFNavigationEntryVisitor.pas +++ b/source/uCEFNavigationEntryVisitor.pas @@ -41,11 +41,11 @@ unit uCEFNavigationEntryVisitor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFOsrBrowserWindow.pas b/source/uCEFOsrBrowserWindow.pas index 37357f56..cb220b29 100644 --- a/source/uCEFOsrBrowserWindow.pas +++ b/source/uCEFOsrBrowserWindow.pas @@ -1,4 +1,4 @@ -// ************************************************************************ +// ************************************************************************ // ***************************** CEF4Delphi ******************************* // ************************************************************************ // @@ -46,7 +46,10 @@ unit uCEFOsrBrowserWindow; -{$mode objfpc}{$H+} +{$IFDEF FPC} + {$MODE OBJFPC}{$H+} +{$ENDIF} + {$i cef.inc} interface diff --git a/source/uCEFOverlayController.pas b/source/uCEFOverlayController.pas index fa93e4fe..e86ab2bf 100644 --- a/source/uCEFOverlayController.pas +++ b/source/uCEFOverlayController.pas @@ -41,11 +41,11 @@ unit uCEFOverlayController; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPDFPrintCallback.pas b/source/uCEFPDFPrintCallback.pas index e64e0e46..05167c2a 100644 --- a/source/uCEFPDFPrintCallback.pas +++ b/source/uCEFPDFPrintCallback.pas @@ -41,11 +41,11 @@ unit uCEFPDFPrintCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPDFPrintOptions.pas b/source/uCEFPDFPrintOptions.pas index 490c5459..5333b67f 100644 --- a/source/uCEFPDFPrintOptions.pas +++ b/source/uCEFPDFPrintOptions.pas @@ -41,11 +41,11 @@ unit uCEFPDFPrintOptions; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPanel.pas b/source/uCEFPanel.pas index 378469af..1dda7231 100644 --- a/source/uCEFPanel.pas +++ b/source/uCEFPanel.pas @@ -41,11 +41,11 @@ unit uCEFPanel; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPanelComponent.pas b/source/uCEFPanelComponent.pas index 0a5879d6..627ced2d 100644 --- a/source/uCEFPanelComponent.pas +++ b/source/uCEFPanelComponent.pas @@ -41,11 +41,11 @@ unit uCEFPanelComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPanelDelegate.pas b/source/uCEFPanelDelegate.pas index 9076a32f..e0f05a1b 100644 --- a/source/uCEFPanelDelegate.pas +++ b/source/uCEFPanelDelegate.pas @@ -41,11 +41,11 @@ unit uCEFPanelDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPostData.pas b/source/uCEFPostData.pas index a8d18fe7..49ccf13a 100644 --- a/source/uCEFPostData.pas +++ b/source/uCEFPostData.pas @@ -41,11 +41,11 @@ unit uCEFPostData; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPostDataElement.pas b/source/uCEFPostDataElement.pas index bc1bd52b..04b56989 100644 --- a/source/uCEFPostDataElement.pas +++ b/source/uCEFPostDataElement.pas @@ -41,11 +41,11 @@ unit uCEFPostDataElement; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPrintDialogCallback.pas b/source/uCEFPrintDialogCallback.pas index 3c95bdf2..a9d5757a 100644 --- a/source/uCEFPrintDialogCallback.pas +++ b/source/uCEFPrintDialogCallback.pas @@ -41,11 +41,11 @@ unit uCEFPrintDialogCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPrintHandler.pas b/source/uCEFPrintHandler.pas index 4b3928c4..81cc51aa 100644 --- a/source/uCEFPrintHandler.pas +++ b/source/uCEFPrintHandler.pas @@ -41,11 +41,11 @@ unit uCEFPrintHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPrintJobCallback.pas b/source/uCEFPrintJobCallback.pas index 7a3ba3f8..9e91e707 100644 --- a/source/uCEFPrintJobCallback.pas +++ b/source/uCEFPrintJobCallback.pas @@ -41,11 +41,11 @@ unit uCEFPrintJobCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFPrintSettings.pas b/source/uCEFPrintSettings.pas index 58a4382b..2ed4d9be 100644 --- a/source/uCEFPrintSettings.pas +++ b/source/uCEFPrintSettings.pas @@ -41,11 +41,11 @@ unit uCEFPrintSettings; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFProcessMessage.pas b/source/uCEFProcessMessage.pas index 9ea90f47..2b4d3477 100644 --- a/source/uCEFProcessMessage.pas +++ b/source/uCEFProcessMessage.pas @@ -41,11 +41,11 @@ unit uCEFProcessMessage; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRegistration.pas b/source/uCEFRegistration.pas index 4ff7c3b1..8135eb8a 100644 --- a/source/uCEFRegistration.pas +++ b/source/uCEFRegistration.pas @@ -41,11 +41,11 @@ unit uCEFRegistration; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRenderHandler.pas b/source/uCEFRenderHandler.pas index dbe4a9f0..8edab70e 100644 --- a/source/uCEFRenderHandler.pas +++ b/source/uCEFRenderHandler.pas @@ -41,11 +41,11 @@ unit uCEFRenderHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRenderProcessHandler.pas b/source/uCEFRenderProcessHandler.pas index fc0b10a8..e55177bb 100644 --- a/source/uCEFRenderProcessHandler.pas +++ b/source/uCEFRenderProcessHandler.pas @@ -41,11 +41,11 @@ unit uCEFRenderProcessHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRequest.pas b/source/uCEFRequest.pas index 0a5e6881..048fa8c7 100644 --- a/source/uCEFRequest.pas +++ b/source/uCEFRequest.pas @@ -41,11 +41,11 @@ unit uCEFRequest; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRequestContext.pas b/source/uCEFRequestContext.pas index 368634e3..74acf5e6 100644 --- a/source/uCEFRequestContext.pas +++ b/source/uCEFRequestContext.pas @@ -41,11 +41,11 @@ unit uCEFRequestContext; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRequestContextHandler.pas b/source/uCEFRequestContextHandler.pas index 18141958..2f5d0a28 100644 --- a/source/uCEFRequestContextHandler.pas +++ b/source/uCEFRequestContextHandler.pas @@ -41,11 +41,11 @@ unit uCEFRequestContextHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRequestHandler.pas b/source/uCEFRequestHandler.pas index ff86a77c..a32914f6 100644 --- a/source/uCEFRequestHandler.pas +++ b/source/uCEFRequestHandler.pas @@ -41,11 +41,11 @@ unit uCEFRequestHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResolveCallback.pas b/source/uCEFResolveCallback.pas index 47d29565..cd7bf482 100644 --- a/source/uCEFResolveCallback.pas +++ b/source/uCEFResolveCallback.pas @@ -41,11 +41,11 @@ unit uCEFResolveCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResourceBundle.pas b/source/uCEFResourceBundle.pas index 3d00d7ca..fd9ed509 100644 --- a/source/uCEFResourceBundle.pas +++ b/source/uCEFResourceBundle.pas @@ -41,11 +41,11 @@ unit uCEFResourceBundle; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResourceBundleHandler.pas b/source/uCEFResourceBundleHandler.pas index 44fa476a..8b6a403f 100644 --- a/source/uCEFResourceBundleHandler.pas +++ b/source/uCEFResourceBundleHandler.pas @@ -41,11 +41,11 @@ unit uCEFResourceBundleHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResourceHandler.pas b/source/uCEFResourceHandler.pas index a26c63e6..922c842d 100644 --- a/source/uCEFResourceHandler.pas +++ b/source/uCEFResourceHandler.pas @@ -41,11 +41,11 @@ unit uCEFResourceHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResourceReadCallback.pas b/source/uCEFResourceReadCallback.pas index a655d9df..3de81057 100644 --- a/source/uCEFResourceReadCallback.pas +++ b/source/uCEFResourceReadCallback.pas @@ -41,11 +41,11 @@ unit uCEFResourceReadCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResourceRequestHandler.pas b/source/uCEFResourceRequestHandler.pas index 69429812..6018c0e5 100644 --- a/source/uCEFResourceRequestHandler.pas +++ b/source/uCEFResourceRequestHandler.pas @@ -41,11 +41,11 @@ unit uCEFResourceRequestHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResourceSkipCallback.pas b/source/uCEFResourceSkipCallback.pas index 51062532..ea331cbf 100644 --- a/source/uCEFResourceSkipCallback.pas +++ b/source/uCEFResourceSkipCallback.pas @@ -41,11 +41,11 @@ unit uCEFResourceSkipCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResponse.pas b/source/uCEFResponse.pas index a55614ad..941e04e2 100644 --- a/source/uCEFResponse.pas +++ b/source/uCEFResponse.pas @@ -41,11 +41,11 @@ unit uCEFResponse; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFResponseFilter.pas b/source/uCEFResponseFilter.pas index 8d2ff428..c5db8473 100644 --- a/source/uCEFResponseFilter.pas +++ b/source/uCEFResponseFilter.pas @@ -41,11 +41,11 @@ unit uCEFResponseFilter; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRunContextMenuCallback.pas b/source/uCEFRunContextMenuCallback.pas index cbe3a6c0..237222ba 100644 --- a/source/uCEFRunContextMenuCallback.pas +++ b/source/uCEFRunContextMenuCallback.pas @@ -41,11 +41,11 @@ unit uCEFRunContextMenuCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFRunFileDialogCallback.pas b/source/uCEFRunFileDialogCallback.pas index cdd45a86..32fa6631 100644 --- a/source/uCEFRunFileDialogCallback.pas +++ b/source/uCEFRunFileDialogCallback.pas @@ -41,11 +41,11 @@ unit uCEFRunFileDialogCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSSLStatus.pas b/source/uCEFSSLStatus.pas index bd6c59ab..d40b77c9 100644 --- a/source/uCEFSSLStatus.pas +++ b/source/uCEFSSLStatus.pas @@ -41,11 +41,11 @@ unit uCEFSSLStatus; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSchemeHandlerFactory.pas b/source/uCEFSchemeHandlerFactory.pas index 78bc95a6..7d57c3e3 100644 --- a/source/uCEFSchemeHandlerFactory.pas +++ b/source/uCEFSchemeHandlerFactory.pas @@ -41,11 +41,11 @@ unit uCEFSchemeHandlerFactory; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSchemeRegistrar.pas b/source/uCEFSchemeRegistrar.pas index 09788d32..e6ce0e99 100644 --- a/source/uCEFSchemeRegistrar.pas +++ b/source/uCEFSchemeRegistrar.pas @@ -41,11 +41,11 @@ unit uCEFSchemeRegistrar; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFScrollView.pas b/source/uCEFScrollView.pas index 0d754edd..b41f62d7 100644 --- a/source/uCEFScrollView.pas +++ b/source/uCEFScrollView.pas @@ -41,11 +41,11 @@ unit uCEFScrollView; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFScrollViewComponent.pas b/source/uCEFScrollViewComponent.pas index fe0649d0..84b51236 100644 --- a/source/uCEFScrollViewComponent.pas +++ b/source/uCEFScrollViewComponent.pas @@ -41,11 +41,11 @@ unit uCEFScrollViewComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSelectClientCertificateCallback.pas b/source/uCEFSelectClientCertificateCallback.pas index 0d9b9ce4..329d0db6 100644 --- a/source/uCEFSelectClientCertificateCallback.pas +++ b/source/uCEFSelectClientCertificateCallback.pas @@ -41,11 +41,11 @@ unit uCEFSelectClientCertificateCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSentinel.pas b/source/uCEFSentinel.pas index fb37c82b..26eb8f48 100644 --- a/source/uCEFSentinel.pas +++ b/source/uCEFSentinel.pas @@ -46,11 +46,11 @@ unit uCEFSentinel; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFServer.pas b/source/uCEFServer.pas index 436e6f42..40992f69 100644 --- a/source/uCEFServer.pas +++ b/source/uCEFServer.pas @@ -41,11 +41,11 @@ unit uCEFServer; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFServerComponent.pas b/source/uCEFServerComponent.pas index 7f066cf9..caaa5a17 100644 --- a/source/uCEFServerComponent.pas +++ b/source/uCEFServerComponent.pas @@ -41,11 +41,11 @@ unit uCEFServerComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFServerEvents.pas b/source/uCEFServerEvents.pas index 26ac880e..60b7adb1 100644 --- a/source/uCEFServerEvents.pas +++ b/source/uCEFServerEvents.pas @@ -41,11 +41,11 @@ unit uCEFServerEvents; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFServerHandler.pas b/source/uCEFServerHandler.pas index de0d2a16..35b0a443 100644 --- a/source/uCEFServerHandler.pas +++ b/source/uCEFServerHandler.pas @@ -41,11 +41,11 @@ unit uCEFServerHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSetCookieCallback.pas b/source/uCEFSetCookieCallback.pas index e70e4a8a..8860fe34 100644 --- a/source/uCEFSetCookieCallback.pas +++ b/source/uCEFSetCookieCallback.pas @@ -41,11 +41,11 @@ unit uCEFSetCookieCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFSslInfo.pas b/source/uCEFSslInfo.pas index adb966e7..3e9892a4 100644 --- a/source/uCEFSslInfo.pas +++ b/source/uCEFSslInfo.pas @@ -41,11 +41,11 @@ unit uCEFSslInfo; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFStreamReader.pas b/source/uCEFStreamReader.pas index a80a74ca..ed8019f4 100644 --- a/source/uCEFStreamReader.pas +++ b/source/uCEFStreamReader.pas @@ -41,11 +41,11 @@ unit uCEFStreamReader; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFStreamWriter.pas b/source/uCEFStreamWriter.pas index e0378a66..5b62c679 100644 --- a/source/uCEFStreamWriter.pas +++ b/source/uCEFStreamWriter.pas @@ -41,11 +41,11 @@ unit uCEFStreamWriter; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFStringList.pas b/source/uCEFStringList.pas index f45c57cd..50450f1e 100644 --- a/source/uCEFStringList.pas +++ b/source/uCEFStringList.pas @@ -41,11 +41,11 @@ unit uCEFStringList; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFStringMap.pas b/source/uCEFStringMap.pas index 7d7e9419..fe662759 100644 --- a/source/uCEFStringMap.pas +++ b/source/uCEFStringMap.pas @@ -41,11 +41,11 @@ unit uCEFStringMap; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFStringMultimap.pas b/source/uCEFStringMultimap.pas index 4c2287d3..a263342e 100644 --- a/source/uCEFStringMultimap.pas +++ b/source/uCEFStringMultimap.pas @@ -41,11 +41,11 @@ unit uCEFStringMultimap; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFStringVisitor.pas b/source/uCEFStringVisitor.pas index b245d787..a2c8b954 100644 --- a/source/uCEFStringVisitor.pas +++ b/source/uCEFStringVisitor.pas @@ -41,11 +41,11 @@ unit uCEFStringVisitor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTask.pas b/source/uCEFTask.pas index 1152dcfb..596c9626 100644 --- a/source/uCEFTask.pas +++ b/source/uCEFTask.pas @@ -41,11 +41,11 @@ unit uCEFTask; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTaskRunner.pas b/source/uCEFTaskRunner.pas index 4b1fa971..075a99a9 100644 --- a/source/uCEFTaskRunner.pas +++ b/source/uCEFTaskRunner.pas @@ -41,11 +41,11 @@ unit uCEFTaskRunner; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTextfield.pas b/source/uCEFTextfield.pas index 4f8a78c8..afc9fc0b 100644 --- a/source/uCEFTextfield.pas +++ b/source/uCEFTextfield.pas @@ -41,11 +41,11 @@ unit uCEFTextfield; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTextfieldComponent.pas b/source/uCEFTextfieldComponent.pas index 60b5e417..60f3786a 100644 --- a/source/uCEFTextfieldComponent.pas +++ b/source/uCEFTextfieldComponent.pas @@ -41,11 +41,11 @@ unit uCEFTextfieldComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTextfieldDelegate.pas b/source/uCEFTextfieldDelegate.pas index c0a0171f..1e44199f 100644 --- a/source/uCEFTextfieldDelegate.pas +++ b/source/uCEFTextfieldDelegate.pas @@ -41,11 +41,11 @@ unit uCEFTextfieldDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFThread.pas b/source/uCEFThread.pas index 20174ac3..1abdacdb 100644 --- a/source/uCEFThread.pas +++ b/source/uCEFThread.pas @@ -41,11 +41,11 @@ unit uCEFThread; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTimerWorkScheduler.pas b/source/uCEFTimerWorkScheduler.pas index 2ef8f524..b3e96024 100644 --- a/source/uCEFTimerWorkScheduler.pas +++ b/source/uCEFTimerWorkScheduler.pas @@ -41,11 +41,11 @@ unit uCEFTimerWorkScheduler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index 2cf65cf9..6e945fc8 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -41,11 +41,11 @@ unit uCEFTypes; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses @@ -708,6 +708,7 @@ type CM_MEDIATYPE_IMAGE, CM_MEDIATYPE_VIDEO, CM_MEDIATYPE_AUDIO, + CM_MEDIATYPE_CANVAS, CM_MEDIATYPE_FILE, CM_MEDIATYPE_PLUGIN ); diff --git a/source/uCEFUrlRequest.pas b/source/uCEFUrlRequest.pas index 33d1d78f..436ac11e 100644 --- a/source/uCEFUrlRequest.pas +++ b/source/uCEFUrlRequest.pas @@ -41,11 +41,11 @@ unit uCEFUrlRequest; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFUrlRequestClientComponent.pas b/source/uCEFUrlRequestClientComponent.pas index 10798dcb..66c124ba 100644 --- a/source/uCEFUrlRequestClientComponent.pas +++ b/source/uCEFUrlRequestClientComponent.pas @@ -41,11 +41,11 @@ unit uCEFUrlRequestClientComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFUrlRequestClientEvents.pas b/source/uCEFUrlRequestClientEvents.pas index 8f3b26de..921dfe1a 100644 --- a/source/uCEFUrlRequestClientEvents.pas +++ b/source/uCEFUrlRequestClientEvents.pas @@ -41,11 +41,11 @@ unit uCEFUrlRequestClientEvents; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFUrlrequestClient.pas b/source/uCEFUrlrequestClient.pas index 4ec7a8a1..8ce17e9d 100644 --- a/source/uCEFUrlrequestClient.pas +++ b/source/uCEFUrlrequestClient.pas @@ -41,11 +41,11 @@ unit uCEFUrlrequestClient; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFValue.pas b/source/uCEFValue.pas index 94ef312c..fb285853 100644 --- a/source/uCEFValue.pas +++ b/source/uCEFValue.pas @@ -41,11 +41,11 @@ unit uCEFValue; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFView.pas b/source/uCEFView.pas index 53cfacb4..2f1ec043 100644 --- a/source/uCEFView.pas +++ b/source/uCEFView.pas @@ -41,11 +41,11 @@ unit uCEFView; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFViewComponent.pas b/source/uCEFViewComponent.pas index aee7f860..e6be3dcd 100644 --- a/source/uCEFViewComponent.pas +++ b/source/uCEFViewComponent.pas @@ -41,11 +41,11 @@ unit uCEFViewComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFViewDelegate.pas b/source/uCEFViewDelegate.pas index 89a5bc39..f41d75a3 100644 --- a/source/uCEFViewDelegate.pas +++ b/source/uCEFViewDelegate.pas @@ -41,11 +41,11 @@ unit uCEFViewDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFViewsFrameworkEvents.pas b/source/uCEFViewsFrameworkEvents.pas index 1927807e..9793c096 100644 --- a/source/uCEFViewsFrameworkEvents.pas +++ b/source/uCEFViewsFrameworkEvents.pas @@ -41,11 +41,11 @@ unit uCEFViewsFrameworkEvents; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWaitableEvent.pas b/source/uCEFWaitableEvent.pas index 8077c4ba..8aa19fb8 100644 --- a/source/uCEFWaitableEvent.pas +++ b/source/uCEFWaitableEvent.pas @@ -41,11 +41,11 @@ unit uCEFWaitableEvent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWebPluginInfo.pas b/source/uCEFWebPluginInfo.pas index 75e15fae..cd6d5296 100644 --- a/source/uCEFWebPluginInfo.pas +++ b/source/uCEFWebPluginInfo.pas @@ -41,11 +41,11 @@ unit uCEFWebPluginInfo; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWebPluginInfoVisitor.pas b/source/uCEFWebPluginInfoVisitor.pas index b6f0703b..8aaa9df2 100644 --- a/source/uCEFWebPluginInfoVisitor.pas +++ b/source/uCEFWebPluginInfoVisitor.pas @@ -41,11 +41,11 @@ unit uCEFWebPluginInfoVisitor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWebPluginUnstableCallback.pas b/source/uCEFWebPluginUnstableCallback.pas index 209bc1ea..7139ae45 100644 --- a/source/uCEFWebPluginUnstableCallback.pas +++ b/source/uCEFWebPluginUnstableCallback.pas @@ -41,11 +41,11 @@ unit uCEFWebPluginUnstableCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWinControl.pas b/source/uCEFWinControl.pas index 8dbe8131..d0efeb6f 100644 --- a/source/uCEFWinControl.pas +++ b/source/uCEFWinControl.pas @@ -46,7 +46,7 @@ unit uCEFWinControl; {$ENDIF} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} {$MINENUMSIZE 4} interface diff --git a/source/uCEFWindow.pas b/source/uCEFWindow.pas index f5a84df9..f5222189 100644 --- a/source/uCEFWindow.pas +++ b/source/uCEFWindow.pas @@ -41,11 +41,11 @@ unit uCEFWindow; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWindowComponent.pas b/source/uCEFWindowComponent.pas index 376fc98f..6ad5d9a6 100644 --- a/source/uCEFWindowComponent.pas +++ b/source/uCEFWindowComponent.pas @@ -41,11 +41,11 @@ unit uCEFWindowComponent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWindowDelegate.pas b/source/uCEFWindowDelegate.pas index c36dd647..bcd4a4c8 100644 --- a/source/uCEFWindowDelegate.pas +++ b/source/uCEFWindowDelegate.pas @@ -41,11 +41,11 @@ unit uCEFWindowDelegate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWindowParent.pas b/source/uCEFWindowParent.pas index 2ffc0449..8b095e1d 100644 --- a/source/uCEFWindowParent.pas +++ b/source/uCEFWindowParent.pas @@ -41,11 +41,11 @@ unit uCEFWindowParent; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWorkScheduler.pas b/source/uCEFWorkScheduler.pas index 79611bac..0ac03915 100644 --- a/source/uCEFWorkScheduler.pas +++ b/source/uCEFWorkScheduler.pas @@ -41,11 +41,11 @@ unit uCEFWorkScheduler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWorkSchedulerQueueThread.pas b/source/uCEFWorkSchedulerQueueThread.pas index e31ba042..daed0aa8 100644 --- a/source/uCEFWorkSchedulerQueueThread.pas +++ b/source/uCEFWorkSchedulerQueueThread.pas @@ -41,11 +41,11 @@ unit uCEFWorkSchedulerQueueThread; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWorkSchedulerThread.pas b/source/uCEFWorkSchedulerThread.pas index e7feac1c..82dd0863 100644 --- a/source/uCEFWorkSchedulerThread.pas +++ b/source/uCEFWorkSchedulerThread.pas @@ -41,11 +41,11 @@ unit uCEFWorkSchedulerThread; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFWriteHandler.pas b/source/uCEFWriteHandler.pas index aec54ef1..fd994c03 100644 --- a/source/uCEFWriteHandler.pas +++ b/source/uCEFWriteHandler.pas @@ -41,11 +41,11 @@ unit uCEFWriteHandler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFX509CertPrincipal.pas b/source/uCEFX509CertPrincipal.pas index 55d881ca..7246d982 100644 --- a/source/uCEFX509CertPrincipal.pas +++ b/source/uCEFX509CertPrincipal.pas @@ -41,11 +41,11 @@ unit uCEFX509CertPrincipal; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFX509Certificate.pas b/source/uCEFX509Certificate.pas index a808a6fb..54fc5193 100644 --- a/source/uCEFX509Certificate.pas +++ b/source/uCEFX509Certificate.pas @@ -41,11 +41,11 @@ unit uCEFX509Certificate; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFXmlReader.pas b/source/uCEFXmlReader.pas index 806580a8..24bb9669 100644 --- a/source/uCEFXmlReader.pas +++ b/source/uCEFXmlReader.pas @@ -41,11 +41,11 @@ unit uCEFXmlReader; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFZipReader.pas b/source/uCEFZipReader.pas index c0c1a751..25c80645 100644 --- a/source/uCEFZipReader.pas +++ b/source/uCEFZipReader.pas @@ -41,11 +41,11 @@ unit uCEFZipReader; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8Accessor.pas b/source/uCEFv8Accessor.pas index 198fd2d2..5932758c 100644 --- a/source/uCEFv8Accessor.pas +++ b/source/uCEFv8Accessor.pas @@ -41,11 +41,11 @@ unit uCEFv8Accessor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8ArrayBufferReleaseCallback.pas b/source/uCEFv8ArrayBufferReleaseCallback.pas index b08405bf..138612ed 100644 --- a/source/uCEFv8ArrayBufferReleaseCallback.pas +++ b/source/uCEFv8ArrayBufferReleaseCallback.pas @@ -41,11 +41,11 @@ unit uCEFv8ArrayBufferReleaseCallback; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8Context.pas b/source/uCEFv8Context.pas index e9203839..dbdd1064 100644 --- a/source/uCEFv8Context.pas +++ b/source/uCEFv8Context.pas @@ -41,11 +41,11 @@ unit uCEFv8Context; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8Exception.pas b/source/uCEFv8Exception.pas index 49f7efad..ceaa0f49 100644 --- a/source/uCEFv8Exception.pas +++ b/source/uCEFv8Exception.pas @@ -41,11 +41,11 @@ unit uCEFv8Exception; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8Handler.pas b/source/uCEFv8Handler.pas index 094253df..03dd2350 100644 --- a/source/uCEFv8Handler.pas +++ b/source/uCEFv8Handler.pas @@ -41,11 +41,11 @@ unit uCEFv8Handler; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8Interceptor.pas b/source/uCEFv8Interceptor.pas index 5ea3cd2f..b28e2a50 100644 --- a/source/uCEFv8Interceptor.pas +++ b/source/uCEFv8Interceptor.pas @@ -41,11 +41,11 @@ unit uCEFv8Interceptor; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8StackFrame.pas b/source/uCEFv8StackFrame.pas index 0e03c5ca..0f48c82b 100644 --- a/source/uCEFv8StackFrame.pas +++ b/source/uCEFv8StackFrame.pas @@ -41,11 +41,11 @@ unit uCEFv8StackFrame; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8StackTrace.pas b/source/uCEFv8StackTrace.pas index 5eb83543..1ff57614 100644 --- a/source/uCEFv8StackTrace.pas +++ b/source/uCEFv8StackTrace.pas @@ -41,11 +41,11 @@ unit uCEFv8StackTrace; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/source/uCEFv8Value.pas b/source/uCEFv8Value.pas index 46919bdf..49201381 100644 --- a/source/uCEFv8Value.pas +++ b/source/uCEFv8Value.pas @@ -41,11 +41,11 @@ unit uCEFv8Value; {$MODE OBJFPC}{$H+} {$ENDIF} -{$IFNDEF CPUX64}{$ALIGN ON}{$ENDIF} -{$MINENUMSIZE 4} - {$I cef.inc} +{$IFNDEF TARGET_64BITS}{$ALIGN ON}{$ENDIF} +{$MINENUMSIZE 4} + interface uses diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 026dee83..379313b4 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,9 +2,9 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 359, + "InternalVersion" : 360, "Name" : "cef4delphi_lazarus.lpk", - "Version" : "98.1.21.0" + "Version" : "98.2.0.0" } ], "UpdatePackageData" : {