diff --git a/lcl/interfaces/carbon/carbonwsfactory.pas b/lcl/interfaces/carbon/carbonwsfactory.pas
index 5b6986a6af..019c678fcb 100644
--- a/lcl/interfaces/carbon/carbonwsfactory.pas
+++ b/lcl/interfaces/carbon/carbonwsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, StdCtrls, Spin, PairSplitter,
   Dialogs, ExtCtrls, Buttons, CheckLst, Forms, Menus, Calendar,
-  WSLCLClasses,
+  WSLCLClasses, WSDialogs,
 
   // Carbon units
   CarbonWSButtons, CarbonWSCheckLst, CarbonWSComCtrls, CarbonWSControls,
@@ -257,7 +257,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/cocoa/cocoawsfactory.pas b/lcl/interfaces/cocoa/cocoawsfactory.pas
index 25b34ffe48..0d33650a95 100644
--- a/lcl/interfaces/cocoa/cocoawsfactory.pas
+++ b/lcl/interfaces/cocoa/cocoawsfactory.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, Controls, ComCtrls, StdCtrls, Spin, PairSplitter,
   Dialogs, ExtCtrls, Buttons, CheckLst, Forms, Menus, Calendar,
-  WSLCLClasses,
+  WSLCLClasses, WSDialogs,
   CocoaWSCommon,
   CocoaWSButtons,
   CocoaWSExtCtrls,
@@ -268,7 +268,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/customdrawn/customdrawnwsfactory.pas b/lcl/interfaces/customdrawn/customdrawnwsfactory.pas
index dee099a147..5ba43ec528 100644
--- a/lcl/interfaces/customdrawn/customdrawnwsfactory.pas
+++ b/lcl/interfaces/customdrawn/customdrawnwsfactory.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, Controls, ComCtrls, ImgList, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, Buttons, Forms, Menus,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -268,7 +268,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/fpgui/fpguiwsfactory.pas b/lcl/interfaces/fpgui/fpguiwsfactory.pas
index cae26fe983..0654f93b8b 100644
--- a/lcl/interfaces/fpgui/fpguiwsfactory.pas
+++ b/lcl/interfaces/fpgui/fpguiwsfactory.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, Controls, StdCtrls, Forms, Menus, ExtCtrls, Dialogs, ComCtrls, Grids,
-  Buttons, PairSplitter, WSLCLClasses;
+  Buttons, PairSplitter, WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -264,7 +264,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/gtk/gtkwsfactory.pas b/lcl/interfaces/gtk/gtkwsfactory.pas
index 62b89dc994..30e7fefe3d 100644
--- a/lcl/interfaces/gtk/gtkwsfactory.pas
+++ b/lcl/interfaces/gtk/gtkwsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, ImgList, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, ExtDlgs, Buttons, CheckLst, Forms, Grids, Menus,
-  PairSplitter, WSLCLClasses;
+  PairSplitter, WSLCLClasses, WSDialogs;
 
 
 // imglist
@@ -295,7 +295,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/gtk2/gtk2wsfactory.pas b/lcl/interfaces/gtk2/gtk2wsfactory.pas
index 82a210bf49..d8614942a9 100644
--- a/lcl/interfaces/gtk2/gtk2wsfactory.pas
+++ b/lcl/interfaces/gtk2/gtk2wsfactory.pas
@@ -10,7 +10,7 @@ uses
   // LCL
   Controls, ComCtrls, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, ExtDlgs, Buttons, CheckLst, Forms, Grids, Menus,
-  PairSplitter, WSLCLClasses;
+  PairSplitter, WSLCLClasses, WSDialogs;
 
 
 // imglist
@@ -295,7 +295,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/gtk3/gtk3wsfactory.pas b/lcl/interfaces/gtk3/gtk3wsfactory.pas
index dc37e94841..f39124f12f 100644
--- a/lcl/interfaces/gtk3/gtk3wsfactory.pas
+++ b/lcl/interfaces/gtk3/gtk3wsfactory.pas
@@ -20,7 +20,8 @@ unit Gtk3WSFactory;
 interface
 uses
   Classes, Controls, ComCtrls, Calendar, StdCtrls, Dialogs, ExtCtrls, ExtDlgs,
-  Buttons, Spin, CheckLst, Forms, Menus, ImgList, PairSplitter, WSLCLClasses;
+  Buttons, Spin, CheckLst, Forms, Menus, ImgList, PairSplitter, WSLCLClasses, 
+  WSDialogs;
 
 
 // imglist
@@ -306,7 +307,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/mui/muiwsfactory.pas b/lcl/interfaces/mui/muiwsfactory.pas
index 796a6eeeb8..7133b4b050 100644
--- a/lcl/interfaces/mui/muiwsfactory.pas
+++ b/lcl/interfaces/mui/muiwsfactory.pas
@@ -9,7 +9,7 @@ uses
   Spin,
   MuiWSControls, MUIwsforms, MuiWSMenus, MUIWSStdCtrls,
   MuiWSDialogs, MuiWSComCtrls, MUIWSButtons, MUIWSSpin,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -257,7 +257,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/qt/qtwsfactory.pas b/lcl/interfaces/qt/qtwsfactory.pas
index ad4f8a07bd..5efa0ad2cf 100644
--- a/lcl/interfaces/qt/qtwsfactory.pas
+++ b/lcl/interfaces/qt/qtwsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, Calendar, StdCtrls, Spin, Grids,
   Dialogs, ExtCtrls, Buttons, CheckLst, Forms, Menus, RubberBand, PairSplitter,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -272,7 +272,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/qt5/qtwsfactory.pas b/lcl/interfaces/qt5/qtwsfactory.pas
index b619a04992..6c9fcc7f0c 100644
--- a/lcl/interfaces/qt5/qtwsfactory.pas
+++ b/lcl/interfaces/qt5/qtwsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, Calendar, StdCtrls, Spin, Grids,
   Dialogs, ExtCtrls, Buttons, CheckLst, Forms, Menus, RubberBand, PairSplitter,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -275,7 +275,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/qt6/qtwsfactory.pas b/lcl/interfaces/qt6/qtwsfactory.pas
index b619a04992..6c9fcc7f0c 100644
--- a/lcl/interfaces/qt6/qtwsfactory.pas
+++ b/lcl/interfaces/qt6/qtwsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, Calendar, StdCtrls, Spin, Grids,
   Dialogs, ExtCtrls, Buttons, CheckLst, Forms, Menus, RubberBand, PairSplitter,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -275,7 +275,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/win32/win32wsfactory.pas b/lcl/interfaces/win32/win32wsfactory.pas
index cfe83b296e..9995c545b1 100644
--- a/lcl/interfaces/win32/win32wsfactory.pas
+++ b/lcl/interfaces/win32/win32wsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, ImgList, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, ExtDlgs, Buttons, CheckLst, Forms, Grids, Menus, ShellCtrls,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -276,8 +276,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  RegisterWSComponent(TTaskDialog, TWin32WSTaskDialog);
-  Result := True;
+   RegisterWSComponent(TTaskDialog, TWin32WSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls
diff --git a/lcl/interfaces/wince/wincewsfactory.pas b/lcl/interfaces/wince/wincewsfactory.pas
index 6c8b2dcbfb..58c4a218d8 100644
--- a/lcl/interfaces/wince/wincewsfactory.pas
+++ b/lcl/interfaces/wince/wincewsfactory.pas
@@ -6,7 +6,7 @@ interface
 uses
   Classes, Controls, ComCtrls, ImgList, Calendar, StdCtrls, Spin,
   Dialogs, ExtCtrls, Buttons, CheckLst, Forms, Menus, Grids,
-  WSLCLClasses;
+  WSLCLClasses, WSDialogs;
 
 // imglist
 function RegisterCustomImageListResolution: Boolean;
@@ -266,7 +266,8 @@ end;
 
 function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog';
 begin
-  Result := False;
+   RegisterWSComponent(TTaskDialog, TWSTaskDialog);
+   Result := True;
 end;
 
 // StdCtrls