From b7cc27d3a5161653b493dd98abeed323394c83e1 Mon Sep 17 00:00:00 2001
From: Bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Mon, 24 Jul 2023 11:06:22 +0200
Subject: [PATCH] Refactoring TTaskDialog: - TWSTaskDialog.Execute: Don't cast
 ADlg to TTaskDialog. - Adapt signature of function ExecuteLCLTaskDialog
 accordingly. - Less debug output

---
 lcl/interfaces/win32/win32wsdialogs.pp | 2 +-
 lcl/taskdlgemulation.pp                | 4 ++--
 lcl/widgetset/wsdialogs.pp             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lcl/interfaces/win32/win32wsdialogs.pp b/lcl/interfaces/win32/win32wsdialogs.pp
index f877471807..f297894005 100644
--- a/lcl/interfaces/win32/win32wsdialogs.pp
+++ b/lcl/interfaces/win32/win32wsdialogs.pp
@@ -1867,7 +1867,7 @@ var
 
 
 begin
-  if IsConsole then writeln('TWin32WSTaskDialog.Execute A');
+  //if IsConsole then writeln('TWin32WSTaskDialog.Execute A');
   //if not Assigned(TaskDialogIndirect)  or
   if not TaskDialogIndirectAvailable  or
      (tfForceNonNative in ADlg.Flags)
diff --git a/lcl/taskdlgemulation.pp b/lcl/taskdlgemulation.pp
index 45a017d052..b77cc7a9c8 100644
--- a/lcl/taskdlgemulation.pp
+++ b/lcl/taskdlgemulation.pp
@@ -72,7 +72,7 @@ var
   TaskDialog_Translate: TTaskDialogTranslate;
 
 
-function ExecuteLCLTaskDialog(const ADlg: TTaskDialog; AParentWnd: HWND; out ARadioRes: Integer): Integer;
+function ExecuteLCLTaskDialog(const ADlg: TCustomTaskDialog; AParentWnd: HWND; out ARadioRes: Integer): Integer;
 
 
 type
@@ -236,7 +236,7 @@ end;
 
 
 { -------------- }
-function ExecuteLCLTaskDialog(const ADlg: TTaskDialog; AParentWnd: HWND; out ARadioRes: Integer): Integer;
+function ExecuteLCLTaskDialog(const ADlg: TCustomTaskDialog; AParentWnd: HWND; out ARadioRes: Integer): Integer;
 var
   DlgForm: TLCLTaskDialog;
 begin
diff --git a/lcl/widgetset/wsdialogs.pp b/lcl/widgetset/wsdialogs.pp
index 9c27892973..8655dfc3f5 100644
--- a/lcl/widgetset/wsdialogs.pp
+++ b/lcl/widgetset/wsdialogs.pp
@@ -201,7 +201,7 @@ end;
 class function TWSTaskDialog.Execute(const ADlg: TCustomTaskDialog; AParentWnd: HWND; out ARadioRes: Integer): Integer;
 begin
   //writeln('TWSTaskDialog.Execute: Assigned(ADlg)=',Assigned(ADlg));
-  Result := ExecuteLCLTaskDialog(TTaskDialog(ADlg), AParentWnd, ARadiores);
+  Result := ExecuteLCLTaskDialog(ADlg, AParentWnd, ARadiores);
 end;
 
 { WidgetSetRegistration }