paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 23:56:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

TaskDialog: Win32 WS: don't let TaskDialogIndirect fail if tfUseCommandLinks is set and no custom buttons ar defined.

Browse Source
This commit is contained in:
Bart 2023-08-01 14:47:22 +02:00
parent 188b9b863d
commit a2a14d0641
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1870,7 +1870,6 @@ var
RUCount := 0;
AddTaskDiakogButton(ADlg.Buttons,Config.cButtons,TaskDialogFirstButtonIndex);
AddTaskDiakogButton(ADlg.RadioButtons,Config.cRadioButtons,TaskDialogFirstRadioButtonIndex);
if (Config.cButtons > 0) then
Config.pButtons := @Buttons[0];
if (Config.cRadioButtons > 0) then
@ -1884,6 +1883,10 @@ var
Exclude(Flags,tfVerificationFlagChecked);
if (Config.cButtons=0) and (CommonButtons=[tcbOk]) then
Include(Flags,tfAllowDialogCancellation); // just OK -> Esc/Alt+F4 close
//while the MS docs say that this flag is ignored if Config.cButtons = 0,
//in practice it will make TaskDialogIndirect fail with E_INVALIDARG
if (ADlg.Buttons.Count = 0) then
Exclude(Flags, tfUseCommandLinks);
Config.dwFlags := TaskDialogFlagsToInteger(Flags);
Config.hMainIcon := TD_ICONS[TF_DIALOGICON(ADlg.MainIcon)];