From 32b8f8052a0cf62fe8f9f3dbc539a0f1b3065896 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Fri, 2 Jul 2004 08:02:40 +0000 Subject: Fix for SF 982215: bdist_wininst - Next button not greyed out during file copy. Patch from Mark Hammond. Recompiled binary. Already packported to the 2.3 branch. --- Lib/distutils/command/wininst-6.exe | Bin 61440 -> 61440 bytes Lib/distutils/command/wininst-7.1.exe | Bin 61440 -> 61440 bytes PC/bdist_wininst/install.c | 8 ++++++++ 3 files changed, 8 insertions(+) diff --git a/Lib/distutils/command/wininst-6.exe b/Lib/distutils/command/wininst-6.exe index 8ab173b..efa3bc4 100644 Binary files a/Lib/distutils/command/wininst-6.exe and b/Lib/distutils/command/wininst-6.exe differ diff --git a/Lib/distutils/command/wininst-7.1.exe b/Lib/distutils/command/wininst-7.1.exe index 858f6f2..7be9396 100644 Binary files a/Lib/distutils/command/wininst-7.1.exe and b/Lib/distutils/command/wininst-7.1.exe differ diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index a715528..7ba05aa 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -1708,6 +1708,14 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) hDialog = hwnd; success = TRUE; + /* Disable the buttons while we work. Sending CANCELTOCLOSE has + the effect of disabling the cancel button, which is a) as we + do everything synchronously we can't cancel, and b) the next + step is 'finished', when it is too late to cancel anyway. + The next step being 'Finished' means we also don't need to + restore the button state back */ + PropSheet_SetWizButtons(GetParent(hwnd), 0); + SendMessage(GetParent(hwnd), PSM_CANCELTOCLOSE, 0, 0); /* Make sure the installation directory name ends in a */ /* backslash */ if (python_dir[strlen(python_dir)-1] != '\\') -- cgit v0.12