summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/msi.py9
2 files changed, 5 insertions, 6 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9882957..27160b9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,8 @@ Library
Build
-----
+- Issue #4289: Remove Cancel button from AdvancedDlg.
+
- Issue #1656675: Register a drop handler for .py* files on Windows.
Tools/Demos
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index ae99744..4b1e3d9 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -717,18 +717,15 @@ def add_ui(db):
#####################################################################
# Advanced Dialog.
advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title,
- "CompilePyc", "Next", "Cancel")
+ "CompilePyc", "Ok", "Ok")
advanced.title("Advanced Options for [ProductName]")
# A radio group with two options: allusers, justme
advanced.checkbox("CompilePyc", 135, 60, 230, 50, 3,
- "COMPILEALL", "Compile .py files to byte code after installation", "Next")
+ "COMPILEALL", "Compile .py files to byte code after installation", "Ok")
- c = advanced.next("Finish", "Cancel")
+ c = advanced.cancel("Ok", "CompilePyc", name="Ok") # Button just has location of cancel button.
c.event("EndDialog", "Return")
- c = advanced.cancel("Cancel", "CompilePyc")
- c.event("SpawnDialog", "CancelDlg")
-
#####################################################################
# Existing Directory dialog
dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title,