From 86d6abd65f445a3662c2ac96599ee637b81af8b9 Mon Sep 17 00:00:00 2001 From: Bart <9132501-flyingsheep@users.noreply.gitlab.com> Date: Wed, 26 Jul 2023 00:34:55 +0200 Subject: [PATCH] TTaskDialog: revert the last 2 commits, as they break compilation. --- lcl/interfaces/carbon/carbonwsfactory.pas | 4 ++-- lcl/interfaces/cocoa/cocoawsfactory.pas | 4 ++-- lcl/interfaces/customdrawn/customdrawnwsfactory.pas | 4 ++-- lcl/interfaces/fpgui/fpguiwsfactory.pas | 4 ++-- lcl/interfaces/gtk/gtkwsfactory.pas | 4 ++-- lcl/interfaces/gtk2/gtk2wsfactory.pas | 4 ++-- lcl/interfaces/gtk3/gtk3wsfactory.pas | 4 ++-- lcl/interfaces/mui/muiwsfactory.pas | 4 ++-- lcl/interfaces/qt/qtwsfactory.pas | 4 ++-- lcl/interfaces/qt5/qtwsfactory.pas | 4 ++-- lcl/interfaces/qt6/qtwsfactory.pas | 4 ++-- lcl/interfaces/win32/win32wsfactory.pas | 4 ++-- lcl/interfaces/wince/wincewsfactory.pas | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lcl/interfaces/carbon/carbonwsfactory.pas b/lcl/interfaces/carbon/carbonwsfactory.pas index c956843981..d97d4102b2 100644 --- a/lcl/interfaces/carbon/carbonwsfactory.pas +++ b/lcl/interfaces/carbon/carbonwsfactory.pas @@ -257,8 +257,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TCarbonWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/cocoa/cocoawsfactory.pas b/lcl/interfaces/cocoa/cocoawsfactory.pas index a0622c6377..dc673b39e8 100644 --- a/lcl/interfaces/cocoa/cocoawsfactory.pas +++ b/lcl/interfaces/cocoa/cocoawsfactory.pas @@ -268,8 +268,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TCocoaWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/customdrawn/customdrawnwsfactory.pas b/lcl/interfaces/customdrawn/customdrawnwsfactory.pas index a8cd1736a3..36c084fd04 100644 --- a/lcl/interfaces/customdrawn/customdrawnwsfactory.pas +++ b/lcl/interfaces/customdrawn/customdrawnwsfactory.pas @@ -268,8 +268,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TCDWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/fpgui/fpguiwsfactory.pas b/lcl/interfaces/fpgui/fpguiwsfactory.pas index 3138b30c74..4aa7cb7a38 100644 --- a/lcl/interfaces/fpgui/fpguiwsfactory.pas +++ b/lcl/interfaces/fpgui/fpguiwsfactory.pas @@ -264,8 +264,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TFpGuiWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/gtk/gtkwsfactory.pas b/lcl/interfaces/gtk/gtkwsfactory.pas index 6a67404587..7d8ed52354 100644 --- a/lcl/interfaces/gtk/gtkwsfactory.pas +++ b/lcl/interfaces/gtk/gtkwsfactory.pas @@ -295,8 +295,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TGtkWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/gtk2/gtk2wsfactory.pas b/lcl/interfaces/gtk2/gtk2wsfactory.pas index aada7d5738..1071dc724a 100644 --- a/lcl/interfaces/gtk2/gtk2wsfactory.pas +++ b/lcl/interfaces/gtk2/gtk2wsfactory.pas @@ -295,8 +295,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TGtk2WSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/gtk3/gtk3wsfactory.pas b/lcl/interfaces/gtk3/gtk3wsfactory.pas index 9025f19fe2..2d073179b9 100644 --- a/lcl/interfaces/gtk3/gtk3wsfactory.pas +++ b/lcl/interfaces/gtk3/gtk3wsfactory.pas @@ -306,8 +306,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TGtk3WSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/mui/muiwsfactory.pas b/lcl/interfaces/mui/muiwsfactory.pas index 58469665ef..b45ebd6870 100644 --- a/lcl/interfaces/mui/muiwsfactory.pas +++ b/lcl/interfaces/mui/muiwsfactory.pas @@ -257,8 +257,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TMuiWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/qt/qtwsfactory.pas b/lcl/interfaces/qt/qtwsfactory.pas index e8180d672e..294b1dfdfa 100644 --- a/lcl/interfaces/qt/qtwsfactory.pas +++ b/lcl/interfaces/qt/qtwsfactory.pas @@ -272,8 +272,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TQtWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/qt5/qtwsfactory.pas b/lcl/interfaces/qt5/qtwsfactory.pas index 7314ff3f4d..e64b0d58e2 100644 --- a/lcl/interfaces/qt5/qtwsfactory.pas +++ b/lcl/interfaces/qt5/qtwsfactory.pas @@ -275,8 +275,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TQtWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/qt6/qtwsfactory.pas b/lcl/interfaces/qt6/qtwsfactory.pas index 7314ff3f4d..e64b0d58e2 100644 --- a/lcl/interfaces/qt6/qtwsfactory.pas +++ b/lcl/interfaces/qt6/qtwsfactory.pas @@ -275,8 +275,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TQtWSTaskDialog); + Result := False; end; // StdCtrls diff --git a/lcl/interfaces/win32/win32wsfactory.pas b/lcl/interfaces/win32/win32wsfactory.pas index d0317788be..cfe83b296e 100644 --- a/lcl/interfaces/win32/win32wsfactory.pas +++ b/lcl/interfaces/win32/win32wsfactory.pas @@ -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 5de5dadec7..57011ce95a 100644 --- a/lcl/interfaces/wince/wincewsfactory.pas +++ b/lcl/interfaces/wince/wincewsfactory.pas @@ -266,8 +266,8 @@ end; function RegisterTaskDialog: Boolean; alias : 'WSRegisterTaskDialog'; begin - RegisterWSComponent(TTaskDialog, TWSTaskDialog); - Result := True; + RegisterWSComponent(TTaskDialog, TWinCEWSTaskDialog); + Result := False; end; // StdCtrls