Merged revisions 67283 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67283 | martin.v.loewis | 2008-11-19 14:51:44 +0100 (Mi, 19 Nov 2008) | 1 line
Issue #4289: Remove Cancel button from AdvancedDlg.
........
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 9e20938..aa0202f 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -715,18 +715,15 @@
#####################################################################
# 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,