paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 12:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

TWSTaskDialog: change signature of Execute method. Reason: TTaskDialog is not related to TCommonDialog.

Browse Source 
Eventually we need to cast the parameter to TCustomTaskDialog in the Win32 implementation.
Because of the (Delhi compatible) signature of TTaskDialog.DoExcute, it seems that TCustomTaskDialog cannot
inherit from TCommonDialog, since this method (TCustomTaskDialog.DoExecute) must be dynamic, so it cannot
also be "override" as well.
This commit is contained in:
Bart 2023-07-17 12:43:04 +02:00
parent cfbb089e1f
commit 57e13c67d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -161,7 +161,7 @@ type
TWin32WSTaskDialog = class(TWSTaskDialog)
public
class function Execute(const ACommonDialog: TCommonDialog): Boolean; override;
class function Execute(const ADlg: TCustomTaskDialog): Boolean; override;
end;
function OpenFileDialogCallBack(Wnd: HWND; uMsg: UINT; {%H-}wParam: WPARAM;
@ -1574,9 +1574,9 @@ end;
{ TWin32WSTaskDialog }
class function TWin32WSTaskDialog.Execute(const ACommonDialog: TCommonDialog): Boolean;
class function TWin32WSTaskDialog.Execute(const ADlg: TCustomTaskDialog): Boolean;
begin
Result := inherited Execute(ACommonDialog);
Result := inherited Execute(ADlg);
end;
initialization

4
lcl/widgetset/wsdialogs.pp
View File

@ -106,7 +106,7 @@ type
TWSTaskDialog = class(TWSCommonDialog)
published
class function Execute(const ACommonDialog: TCommonDialog): Boolean; virtual;
class function Execute(const ADlg: TCustomTaskDialog): Boolean; virtual;
end;
{ WidgetSetRegistration }
@ -198,7 +198,7 @@ end;
{ TWSTaskDialog }
class function TWSTaskDialog.Execute(const ACommonDialog: TCommonDialog): Boolean;
class function TWSTaskDialog.Execute(const ADlg: TCustomTaskDialog): Boolean;
begin
//ToDo call new LCLTaskDialog.Execute
Result := False;