From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 19 Nov 2008 13:51:44 +0000 (+0000)
Subject: Issue #4289: Remove Cancel button from AdvancedDlg.
X-Git-Tag: v2.7a1~2650
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6347098a26238b6646680d8c6696595c6742292e;p=thirdparty%2FPython%2Fcpython.git

Issue #4289: Remove Cancel button from AdvancedDlg.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 12149599575e..c8a16b723358 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,8 @@ Library
 Build
 -----
 
+- Issue #4289: Remove Cancel button from AdvancedDlg.
+
 - Issue #1656675: Register a drop handler for .py* files on Windows.
 
 - Issue #4120: Exclude manifest from extension modules in VS2008.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 847db87bb2ef..6411ac92dc19 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -716,18 +716,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,