diff --git a/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas b/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas index 90e1b5fb..e82d38c0 100644 --- a/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas +++ b/demos/Delphi_VCL/MiniBrowser/uMiniBrowser.pas @@ -166,12 +166,12 @@ type procedure Chromium1BeforeResourceLoad(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const request: ICefRequest; const callback: ICefRequestCallback; out Result: TCefReturnValue); procedure Chromium1Close(Sender: TObject; const browser: ICefBrowser; var aAction : TCefCloseBrowserAction); procedure Chromium1BeforeClose(Sender: TObject; const browser: ICefBrowser); - procedure Chromium1RenderCompMsg(var aMessage : TMessage; var aHandled: Boolean); + procedure Chromium1RenderCompMsg(Sender: TObject; var aMessage : TMessage; var aHandled: Boolean); procedure Chromium1LoadingProgressChange(Sender: TObject; const browser: ICefBrowser; const progress: Double); procedure Chromium1LoadEnd(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; httpStatusCode: Integer); procedure Chromium1LoadError(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; errorCode: Integer; const errorText, failedUrl: ustring); procedure Chromium1CertificateError(Sender: TObject; const browser: ICefBrowser; certError: Integer; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback; out Result: Boolean); - procedure Chromium1NavigationVisitorResultAvailable( const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult: Boolean); + procedure Chromium1NavigationVisitorResultAvailable(Sender: TObject; const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult: Boolean); procedure Chromium1DownloadImageFinished(Sender: TObject; const imageUrl: ustring; httpStatusCode: Integer; const image: ICefImage); procedure Chromium1CookiesFlushed(Sender: TObject); procedure Chromium1BeforePluginLoad(Sender: TObject; const mimeType, pluginUrl: ustring; isMainFrame: Boolean; const topOriginUrl: ustring; const pluginInfo: ICefWebPluginInfo; var pluginPolicy: TCefPluginPolicy; var aResult: Boolean); @@ -783,7 +783,7 @@ begin end; end; -procedure TMiniBrowserFrm.Chromium1NavigationVisitorResultAvailable( +procedure TMiniBrowserFrm.Chromium1NavigationVisitorResultAvailable(Sender: TObject; const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult: Boolean); begin @@ -820,7 +820,7 @@ begin isKeyboardShortcut := True; end; -procedure TMiniBrowserFrm.Chromium1RenderCompMsg(var aMessage : TMessage; var aHandled: Boolean); +procedure TMiniBrowserFrm.Chromium1RenderCompMsg(Sender: TObject; var aMessage : TMessage; var aHandled: Boolean); begin if not(FClosing) and (aMessage.Msg = WM_MOUSEMOVE) then begin diff --git a/demos/Lazarus/MiniBrowser/MiniBrowser.lps b/demos/Lazarus/MiniBrowser/MiniBrowser.lps index d4fd5fa9..fcd9a420 100644 --- a/demos/Lazarus/MiniBrowser/MiniBrowser.lps +++ b/demos/Lazarus/MiniBrowser/MiniBrowser.lps @@ -22,8 +22,8 @@ - - + + @@ -267,7 +267,7 @@ - + @@ -276,6 +276,18 @@ + + + + + + + + + + + + diff --git a/demos/Lazarus/MiniBrowser/uMiniBrowser.pas b/demos/Lazarus/MiniBrowser/uMiniBrowser.pas index af895cfc..63b2dd02 100644 --- a/demos/Lazarus/MiniBrowser/uMiniBrowser.pas +++ b/demos/Lazarus/MiniBrowser/uMiniBrowser.pas @@ -215,7 +215,7 @@ type var aAction : TCefCloseBrowserAction); procedure Chromium1BeforeClose(Sender: TObject; const browser: ICefBrowser); - procedure Chromium1RenderCompMsg(var aMessage : TMessage; var aHandled: Boolean); + procedure Chromium1RenderCompMsg(Sender: TObject; var aMessage : TMessage; var aHandled: Boolean); procedure Chromium1LoadingProgressChange(Sender: TObject; const browser: ICefBrowser; const progress: Double); procedure OpenfilewithaDAT1Click(Sender: TObject); @@ -229,7 +229,7 @@ type const browser: ICefBrowser; certError: Integer; const requestUrl: ustring; const sslInfo: ICefSslInfo; const callback: ICefRequestCallback; out Result: Boolean); - procedure Chromium1NavigationVisitorResultAvailable( + procedure Chromium1NavigationVisitorResultAvailable(Sender: TObject; const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult: Boolean); @@ -821,7 +821,7 @@ begin end; end; -procedure TMiniBrowserFrm.Chromium1NavigationVisitorResultAvailable( +procedure TMiniBrowserFrm.Chromium1NavigationVisitorResultAvailable(Sender: TObject; const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult: Boolean); begin @@ -858,7 +858,7 @@ begin isKeyboardShortcut := True; end; -procedure TMiniBrowserFrm.Chromium1RenderCompMsg(var aMessage : TMessage; var aHandled: Boolean); +procedure TMiniBrowserFrm.Chromium1RenderCompMsg(Sender: TObject; var aMessage : TMessage; var aHandled: Boolean); begin if not(FClosing) and (aMessage.Msg = WM_MOUSEMOVE) then begin diff --git a/source/uCEFChromiumCore.pas b/source/uCEFChromiumCore.pas index e11df930..c0406131 100644 --- a/source/uCEFChromiumCore.pas +++ b/source/uCEFChromiumCore.pas @@ -4253,7 +4253,7 @@ begin Result := False; if assigned(FOnNavigationVisitorResultAvailable) then - FOnNavigationVisitorResultAvailable(entry, current, index, total, Result); + FOnNavigationVisitorResultAvailable(self, entry, current, index, total, Result); end; procedure TChromiumCore.doDownloadImageFinished(const imageUrl : ustring; @@ -4850,7 +4850,7 @@ begin try if assigned(FOnBrowserCompMsg) then - FOnBrowserCompMsg(aMessage, TempHandled); + FOnBrowserCompMsg(self, aMessage, TempHandled); if not(TempHandled) then CallOldCompWndProc(FOldBrowserCompWndPrc, FBrowserCompHWND, aMessage); @@ -4873,7 +4873,7 @@ begin try if assigned(FOnWidgetCompMsg) then - FOnWidgetCompMsg(aMessage, TempHandled); + FOnWidgetCompMsg(self, aMessage, TempHandled); if not(TempHandled) then CallOldCompWndProc(FOldWidgetCompWndPrc, FWidgetCompHWND, aMessage); @@ -4896,7 +4896,7 @@ begin try if assigned(FOnRenderCompMsg) then - FOnRenderCompMsg(aMessage, TempHandled); + FOnRenderCompMsg(self, aMessage, TempHandled); if not(TempHandled) then CallOldCompWndProc(FOldRenderCompWndPrc, FRenderCompHWND, aMessage); diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas index 215dc698..d43bfec1 100644 --- a/source/uCEFChromiumEvents.pas +++ b/source/uCEFChromiumEvents.pas @@ -203,7 +203,7 @@ type TOnPrefsAvailableEvent = procedure(Sender: TObject; aResultOK : boolean) of object; TOnCookiesDeletedEvent = procedure(Sender: TObject; numDeleted : integer) of object; TOnResolvedIPsAvailableEvent = procedure(Sender: TObject; result: TCefErrorCode; const resolvedIps: TStrings) of object; - TOnNavigationVisitorResultAvailableEvent = procedure(const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult : boolean) of object; + TOnNavigationVisitorResultAvailableEvent = procedure(Sender: TObject; const entry: ICefNavigationEntry; current: Boolean; index, total: Integer; var aResult : boolean) of object; TOnDownloadImageFinishedEvent = procedure(Sender: TObject; const imageUrl: ustring; httpStatusCode: Integer; const image: ICefImage) of object; TOnExecuteTaskOnCefThread = procedure(Sender: TObject; aTaskID : cardinal) of object; TOnCookiesVisited = procedure(Sender: TObject; const name_, value, domain, path: ustring; secure, httponly, hasExpires: Boolean; const creation, lastAccess, expires: TDateTime; count, total, aID : Integer; same_site : TCefCookieSameSite; priority : TCefCookiePriority; var aDeleteCookie, aResult : Boolean) of object; @@ -213,7 +213,7 @@ type TOnMediaRouteCreateFinishedEvent = procedure(Sender: TObject; result: TCefMediaRouterCreateResult; const error: ustring; const route: ICefMediaRoute) of object; TOnMediaSinkDeviceInfoEvent = procedure(Sender: TObject; const ip_address: ustring; port: integer; const model_name: ustring) of object; {$IFDEF MSWINDOWS} - TOnCompMsgEvent = procedure(var aMessage: TMessage; var aHandled: Boolean) of object; + TOnCompMsgEvent = procedure(Sender: TObject; var aMessage: TMessage; var aHandled: Boolean) of object; {$ENDIF} implementation diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 67502f44..1c392e2f 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 182, + "InternalVersion" : 183, "Name" : "cef4delphi_lazarus.lpk", "Version" : "85.3.7.0" }