From e1d2db658f463f78348ab80491e736b5647d1225 Mon Sep 17 00:00:00 2001
From: Bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Mon, 24 Jul 2023 11:12:55 +0200
Subject: [PATCH] Refactoring TTaskDialog: remove hack of exposing
 TCustomTaskDialog.FWidth. It was unneccessary to begin with...

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

diff --git a/lcl/dialogs.pp b/lcl/dialogs.pp
index d2fce536d5..adcbd95471 100644
--- a/lcl/dialogs.pp
+++ b/lcl/dialogs.pp
@@ -634,6 +634,7 @@ type
     FText: TTranslateString;
     FTitle: TTranslateString;
     FVerificationText: TTranslateString;
+    FWidth: Integer;
     FOnButtonClicked: TTaskDlgClickEvent;
     //procedure DoOnButtonClickedHandler(Sender: PTaskDialog; AButtonID: Integer;
     //  var ACanClose: Boolean);
@@ -644,8 +645,6 @@ type
     function DoExecute(ParentWnd: HWND): Boolean; dynamic;
     procedure DoOnButtonClicked(AModalResult: Integer; var ACanClose: Boolean); dynamic;
   public
-    FWidth: Integer; //ToDo: make this a readonly property, so we can use it in the TaskDlgEmulation unit.
-
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     function ButtonIDToModalResult(const AButtonID: Integer): TModalResult;
diff --git a/lcl/interfaces/win32/win32wsdialogs.pp b/lcl/interfaces/win32/win32wsdialogs.pp
index f297894005..025800d970 100644
--- a/lcl/interfaces/win32/win32wsdialogs.pp
+++ b/lcl/interfaces/win32/win32wsdialogs.pp
@@ -1856,7 +1856,7 @@ var
       Config.nDefaultRadioButton := DefRB + TaskDialogFirstRadioButtonIndex;
     //writeln('PrepareTaskDialogConfig O');
 
-    Config.cxWidth := MulDiv(ADlg.FWidth, 4, DialogBaseUnits);  // cxWidth needed in "dialog units"
+    Config.cxWidth := MulDiv(ADlg.Width, 4, DialogBaseUnits);  // cxWidth needed in "dialog units"
     //writeln('PrepareTaskDialogConfig P');
 
     Config.pfCallback := @TaskDialogCallbackProc;
diff --git a/lcl/taskdlgemulation.pp b/lcl/taskdlgemulation.pp
index b77cc7a9c8..c2816ee189 100644
--- a/lcl/taskdlgemulation.pp
+++ b/lcl/taskdlgemulation.pp
@@ -695,7 +695,7 @@ begin
   if (FontHeight = 0) then
     FontHeight := Screen.SystemFont.Height;
 
-  aWidth := FDlg.FWidth;
+  aWidth := FDlg.Width;
   if (aWidth <= 0) then
   begin
     aWidth := Canvas.TextWidth(DlgTitle);