diff --git a/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas b/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas index db2b212d..578b4c0d 100644 --- a/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas +++ b/demos/Delphi_FMX/FMXExternalPumpBrowser/uFMXExternalPumpBrowser.pas @@ -97,7 +97,7 @@ type procedure chrmosrTooltip(Sender: TObject; const browser: ICefBrowser; var text: ustring; out Result: Boolean); procedure chrmosrBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); procedure chrmosrAfterCreated(Sender: TObject; const browser: ICefBrowser); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); procedure Timer1Timer(Sender: TObject); procedure AddressEdtEnter(Sender: TObject); @@ -543,10 +543,9 @@ begin Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); end; -// TO-DO: The "cursor" parameter should be TCefCursorHandle but Delphi shows a warning if it's not declared as HICON. procedure TFMXExternalPumpBrowserFrm.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : Boolean); diff --git a/demos/Delphi_FMX/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas b/demos/Delphi_FMX/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas index 4a00560b..75044bfd 100644 --- a/demos/Delphi_FMX/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas +++ b/demos/Delphi_FMX/FMXExternalPumpBrowser2/uFMXExternalPumpBrowser2.pas @@ -104,7 +104,7 @@ type procedure chrmosrTooltip(Sender: TObject; const browser: ICefBrowser; var text: ustring; out Result: Boolean); procedure chrmosrBeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess: Boolean; var Result: Boolean); procedure chrmosrAfterCreated(Sender: TObject; const browser: ICefBrowser); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); procedure chrmosrLoadingStateChange(Sender: TObject; const browser: ICefBrowser; isLoading, canGoBack, canGoForward: Boolean); procedure chrmosrLoadError(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; errorCode: Integer; const errorText, failedUrl: ustring); @@ -482,10 +482,9 @@ begin Result := (targetDisposition in [WOD_NEW_FOREGROUND_TAB, WOD_NEW_BACKGROUND_TAB, WOD_NEW_POPUP, WOD_NEW_WINDOW]); end; -// TO-DO: The "cursor" parameter should be TCefCursorHandle but Delphi shows a warning if it's not declared as HICON. procedure TFMXExternalPumpBrowserFrm.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : TCefCursorHandle; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : Boolean); diff --git a/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas b/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas index 76f7b703..41b456a4 100644 --- a/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas +++ b/demos/Delphi_FMX/FMXTabbedOSRBrowser/uBrowserFrame.pas @@ -87,7 +87,7 @@ type procedure FMXChromium1AfterCreated(Sender: TObject; const browser: ICefBrowser); procedure FMXChromium1BeforeClose(Sender: TObject; const browser: ICefBrowser); procedure FMXChromium1BeforePopup(Sender: TObject; const browser: ICefBrowser; const frame: ICefFrame; const targetUrl, targetFrameName: ustring; targetDisposition: TCefWindowOpenDisposition; userGesture: Boolean; const popupFeatures: TCefPopupFeatures; var windowInfo: TCefWindowInfo; var client: ICefClient; var settings: TCefBrowserSettings; var extra_info: ICefDictionaryValue; var noJavascriptAccess, Result: Boolean); - procedure FMXChromium1CursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); + procedure FMXChromium1CursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); procedure FMXChromium1GetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); procedure FMXChromium1GetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure FMXChromium1GetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); @@ -447,7 +447,7 @@ begin end; procedure TBrowserFrame.FMXChromium1CursorChange(Sender: TObject; - const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; + const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); begin FMXBufferPanel1.Cursor := CefCursorToWindowsCursor(cursorType); diff --git a/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas b/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas index 262afaec..3371446e 100644 --- a/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas +++ b/demos/Delphi_VCL/ConsoleBrowser/uWebBrowser.pas @@ -81,7 +81,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult: Boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -306,7 +306,7 @@ end; procedure TWebBrowserFrm.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : Boolean); diff --git a/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas b/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas index 65f74625..c93c3b4e 100644 --- a/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas +++ b/demos/Delphi_VCL/KioskOSRBrowser/uKioskOSRBrowser.pas @@ -98,7 +98,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -372,7 +372,7 @@ end; procedure TForm1.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); diff --git a/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas b/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas index 5d62e9b3..2a0f3bbd 100644 --- a/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas +++ b/demos/Delphi_VCL/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas @@ -91,7 +91,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -349,7 +349,7 @@ end; procedure TOSRExternalPumpBrowserFrm.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); diff --git a/demos/Delphi_VCL/PopupBrowser/uChildForm.pas b/demos/Delphi_VCL/PopupBrowser/uChildForm.pas index 38187539..2cfac32c 100644 --- a/demos/Delphi_VCL/PopupBrowser/uChildForm.pas +++ b/demos/Delphi_VCL/PopupBrowser/uChildForm.pas @@ -79,7 +79,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure Chromium1Paint(Sender: TObject; const browser: ICefBrowser; type_: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); - procedure Chromium1CursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure Chromium1CursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure Chromium1GetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure Chromium1GetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure Chromium1GetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -358,7 +358,7 @@ end; procedure TChildForm.Chromium1CursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); diff --git a/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas b/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas index 17561074..e6ec4a10 100644 --- a/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas +++ b/demos/Delphi_VCL/SimpleOSRBrowser/uSimpleOSRBrowser.pas @@ -101,7 +101,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; width, height: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -422,7 +422,7 @@ end; procedure TForm1.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - cursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); diff --git a/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas b/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas index da3c3eb1..cdb49c3d 100644 --- a/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas +++ b/demos/Lazarus_Windows/OSRExternalPumpBrowser/uOSRExternalPumpBrowser.pas @@ -92,7 +92,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; aWidth, aHeight: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; aCursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -324,11 +324,11 @@ begin end; procedure TOSRExternalPumpBrowserFrm.chrmosrCursorChange(Sender : TObject; - const browser : ICefBrowser; - aCursor : HICON; - cursorType : TCefCursorType; - const customCursorInfo : PCefCursorInfo; - var aResult : boolean); + const browser : ICefBrowser; + cursor_ : TCefCursorHandle; + cursorType : TCefCursorType; + const customCursorInfo : PCefCursorInfo; + var aResult : boolean); begin Panel1.Cursor := CefCursorToWindowsCursor(cursorType); aResult := True; diff --git a/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas b/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas index 3768363a..d881ca14 100644 --- a/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas +++ b/demos/Lazarus_Windows/PopupBrowser/uChildForm.pas @@ -85,7 +85,7 @@ type procedure FormClose(Sender: TObject; var aAction: TCloseAction); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; aWidth, aHeight: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; aCursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -287,7 +287,7 @@ end; procedure TChildForm.chrmosrCursorChange( Sender : TObject; const browser : ICefBrowser; - aCursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); diff --git a/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas b/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas index cc196843..03fe48ac 100644 --- a/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas +++ b/demos/Lazarus_Windows/SimpleOSRBrowser/usimplelazosrbrowser.pas @@ -89,7 +89,7 @@ type procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean); procedure chrmosrPaint(Sender: TObject; const browser: ICefBrowser; kind: TCefPaintElementType; dirtyRectsCount: NativeUInt; const dirtyRects: PCefRectArray; const buffer: Pointer; aWidth, aHeight: Integer); - procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; aCursor: HICON; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure chrmosrCursorChange(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure chrmosrGetViewRect(Sender: TObject; const browser: ICefBrowser; var rect: TCefRect); procedure chrmosrGetScreenPoint(Sender: TObject; const browser: ICefBrowser; viewX, viewY: Integer; var screenX, screenY: Integer; out Result: Boolean); procedure chrmosrGetScreenInfo(Sender: TObject; const browser: ICefBrowser; var screenInfo: TCefScreenInfo; out Result: Boolean); @@ -334,7 +334,7 @@ end; procedure TForm1.chrmosrCursorChange(Sender : TObject; const browser : ICefBrowser; - aCursor : HICON; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); diff --git a/source/uCEFChromiumCore.pas b/source/uCEFChromiumCore.pas index e0bd9728..9c29cecf 100644 --- a/source/uCEFChromiumCore.pas +++ b/source/uCEFChromiumCore.pas @@ -510,7 +510,7 @@ type function doOnConsoleMessage(const browser: ICefBrowser; level: TCefLogSeverity; const aMessage, source: ustring; line: Integer): Boolean; virtual; function doOnAutoResize(const browser: ICefBrowser; const new_size: PCefSize): Boolean; virtual; procedure doOnLoadingProgressChange(const browser: ICefBrowser; const progress: double); virtual; - procedure doOnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); virtual; + procedure doOnCursorChange(const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); virtual; // ICefDownloadHandler procedure doOnBeforeDownload(const browser: ICefBrowser; const downloadItem: ICefDownloadItem; const suggestedName: ustring; const callback: ICefBeforeDownloadCallback); virtual; @@ -5462,7 +5462,7 @@ begin end; procedure TChromiumCore.doOnCursorChange(const browser : ICefBrowser; - cursor : TCefCursorHandle; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); @@ -5470,7 +5470,7 @@ begin aResult := False; if assigned(FOnCursorChange) then - FOnCursorChange(self, browser, cursor, cursorType, customCursorInfo, aResult); + FOnCursorChange(self, browser, cursor_, cursorType, customCursorInfo, aResult); end; procedure TChromiumCore.doOnDialogClosed(const browser: ICefBrowser); diff --git a/source/uCEFChromiumEvents.pas b/source/uCEFChromiumEvents.pas index 95b4c3ad..7eceacd5 100644 --- a/source/uCEFChromiumEvents.pas +++ b/source/uCEFChromiumEvents.pas @@ -91,7 +91,7 @@ type TOnConsoleMessage = procedure(Sender: TObject; const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring; line: Integer; out Result: Boolean) of object; TOnAutoResize = procedure(Sender: TObject; const browser: ICefBrowser; const new_size: PCefSize; out Result: Boolean) of object; TOnLoadingProgressChange = procedure(Sender: TObject; const browser: ICefBrowser; const progress: double) of object; - TOnCursorChange = procedure(Sender: TObject; const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean) of Object; + TOnCursorChange = procedure(Sender: TObject; const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean) of Object; // ICefDownloadHandler TOnBeforeDownload = procedure(Sender: TObject; const browser: ICefBrowser; const downloadItem: ICefDownloadItem; const suggestedName: ustring; const callback: ICefBeforeDownloadCallback) of object; diff --git a/source/uCEFDisplayHandler.pas b/source/uCEFDisplayHandler.pas index e17005b4..84c28893 100644 --- a/source/uCEFDisplayHandler.pas +++ b/source/uCEFDisplayHandler.pas @@ -68,7 +68,7 @@ type function OnConsoleMessage(const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring; line: Integer): Boolean; virtual; function OnAutoResize(const browser: ICefBrowser; const new_size: PCefSize): Boolean; virtual; procedure OnLoadingProgressChange(const browser: ICefBrowser; const progress: double); virtual; - procedure OnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); virtual; + procedure OnCursorChange(const browser: ICefBrowser; cursor_: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); virtual; procedure RemoveReferences; virtual; @@ -89,7 +89,7 @@ type function OnConsoleMessage(const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring; line: Integer): Boolean; override; function OnAutoResize(const browser: ICefBrowser; const new_size: PCefSize): Boolean; override; procedure OnLoadingProgressChange(const browser: ICefBrowser; const progress: double); override; - procedure OnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); override; + procedure OnCursorChange(const browser: ICefBrowser; cursor_: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); override; procedure RemoveReferences; override; @@ -323,7 +323,7 @@ begin // end; -procedure TCefDisplayHandlerOwn.OnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); +procedure TCefDisplayHandlerOwn.OnCursorChange(const browser: ICefBrowser; cursor_: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); begin aResult := False; end; @@ -414,13 +414,13 @@ begin end; procedure TCustomDisplayHandler.OnCursorChange(const browser : ICefBrowser; - cursor : TCefCursorHandle; + cursor_ : TCefCursorHandle; cursorType : TCefCursorType; const customCursorInfo : PCefCursorInfo; var aResult : boolean); begin if (FEvents <> nil) then - IChromiumEvents(FEvents).doOnCursorChange(browser, cursor, cursorType, customCursorInfo, aResult); + IChromiumEvents(FEvents).doOnCursorChange(browser, cursor_, cursorType, customCursorInfo, aResult); end; procedure TCustomDisplayHandler.OnFaviconUrlChange(const browser: ICefBrowser; const iconUrls: TStrings); diff --git a/source/uCEFInterfaces.pas b/source/uCEFInterfaces.pas index d80fd678..938bc309 100644 --- a/source/uCEFInterfaces.pas +++ b/source/uCEFInterfaces.pas @@ -352,7 +352,7 @@ type function doOnConsoleMessage(const browser: ICefBrowser; level: TCefLogSeverity; const message, source: ustring; line: Integer): Boolean; function doOnAutoResize(const browser: ICefBrowser; const new_size: PCefSize): Boolean; procedure doOnLoadingProgressChange(const browser: ICefBrowser; const progress: double); - procedure doOnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure doOnCursorChange(const browser: ICefBrowser; cursor_: TCefCursorHandle; cursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); // ICefDownloadHandler procedure doOnBeforeDownload(const browser: ICefBrowser; const downloadItem: ICefDownloadItem; const suggestedName: ustring; const callback: ICefBeforeDownloadCallback); @@ -1967,7 +1967,7 @@ type function OnConsoleMessage(const browser: ICefBrowser; level: TCefLogSeverity; const message_, source: ustring; line: Integer): Boolean; function OnAutoResize(const browser: ICefBrowser; const new_size: PCefSize): Boolean; procedure OnLoadingProgressChange(const browser: ICefBrowser; const progress: double); - procedure OnCursorChange(const browser: ICefBrowser; cursor: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); + procedure OnCursorChange(const browser: ICefBrowser; cursor_: TCefCursorHandle; CursorType: TCefCursorType; const customCursorInfo: PCefCursorInfo; var aResult : boolean); procedure RemoveReferences; // custom procedure to clear all references end; diff --git a/source/uCEFTypes.pas b/source/uCEFTypes.pas index f4eac77a..2d2c88d5 100644 --- a/source/uCEFTypes.pas +++ b/source/uCEFTypes.pas @@ -259,24 +259,24 @@ type {$IFDEF MSWINDOWS} - TCefWindowHandle = HWND; // /include/internal/cef_types_win.h (cef_window_handle_t) - TCefCursorHandle = HCURSOR; // /include/internal/cef_types_win.h (cef_cursor_handle_t) - TCefEventHandle = PMsg; // /include/internal/cef_types_win.h (cef_event_handle_t) + TCefWindowHandle = type HWND; // /include/internal/cef_types_win.h (cef_window_handle_t) + TCefCursorHandle = type HCURSOR; // /include/internal/cef_types_win.h (cef_cursor_handle_t) + TCefEventHandle = type PMsg; // /include/internal/cef_types_win.h (cef_event_handle_t) {$ENDIF} {$IFDEF MACOS} - TCefWindowHandle = Pointer; // /include/internal/cef_types_mac.h (cef_window_handle_t) - TCefCursorHandle = Pointer; // /include/internal/cef_types_mac.h (cef_cursor_handle_t) - TCefEventHandle = Pointer; // /include/internal/cef_types_mac.h (cef_event_handle_t) + TCefWindowHandle = type Pointer; // /include/internal/cef_types_mac.h (cef_window_handle_t) + TCefCursorHandle = type Pointer; // /include/internal/cef_types_mac.h (cef_cursor_handle_t) + TCefEventHandle = type Pointer; // /include/internal/cef_types_mac.h (cef_event_handle_t) {$ENDIF} {$IFDEF LINUX} {$IFDEF FPC} - TCefWindowHandle = culong; // /include/internal/cef_types_linux.h (cef_window_handle_t) - TCefCursorHandle = culong; // /include/internal/cef_types_linux.h (cef_cursor_handle_t) + TCefWindowHandle = type culong; // /include/internal/cef_types_linux.h (cef_window_handle_t) + TCefCursorHandle = type culong; // /include/internal/cef_types_linux.h (cef_cursor_handle_t) {$ELSE} - TCefWindowHandle = LongWord; // /include/internal/cef_types_linux.h (cef_window_handle_t) - TCefCursorHandle = LongWord; // /include/internal/cef_types_linux.h (cef_cursor_handle_t) + TCefWindowHandle = type LongWord; // /include/internal/cef_types_linux.h (cef_window_handle_t) + TCefCursorHandle = type LongWord; // /include/internal/cef_types_linux.h (cef_cursor_handle_t) {$ENDIF} - TCefEventHandle = PXEvent; // /include/internal/cef_types_linux.h (cef_event_handle_t) + TCefEventHandle = type PXEvent; // /include/internal/cef_types_linux.h (cef_event_handle_t) {$ENDIF} diff --git a/update_CEF4Delphi.json b/update_CEF4Delphi.json index 393b206d..eb694a7b 100644 --- a/update_CEF4Delphi.json +++ b/update_CEF4Delphi.json @@ -2,7 +2,7 @@ "UpdateLazPackages" : [ { "ForceNotify" : true, - "InternalVersion" : 241, + "InternalVersion" : 242, "Name" : "cef4delphi_lazarus.lpk", "Version" : "88.1.6.0" }