[Python-checkins] r67283 - in python/trunk: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Wed Nov 19 14:51:44 2008
New Revision: 67283

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

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Tools/msi/msi.py

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Wed Nov 19 14:51:44 2008
@@ -66,6 +66,8 @@
 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.

Modified: python/trunk/Tools/msi/msi.py
==============================================================================
--- python/trunk/Tools/msi/msi.py	(original)
+++ python/trunk/Tools/msi/msi.py	Wed Nov 19 14:51:44 2008
@@ -716,18 +716,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,