Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Martin v. Löwis 2008-11-19 13:54:01 +00:00
parent 90a79e84a3
commit 45a276cdd2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -63,6 +63,8 @@ Library
Build Build
----- -----
- Issue #4289: Remove Cancel button from AdvancedDlg.
- Issue #1656675: Register a drop handler for .py* files on Windows. - Issue #1656675: Register a drop handler for .py* files on Windows.
- Issue #4120: Exclude manifest from extension modules in VS2008. - Issue #4120: Exclude manifest from extension modules in VS2008.

9
Tools/msi/msi.py
View File

@ -715,18 +715,15 @@ def add_ui(db):
##################################################################### #####################################################################
# Advanced Dialog. # Advanced Dialog.
advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title, advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title,
"CompilePyc", "Next", "Cancel") "CompilePyc", "Ok", "Ok")
advanced.title("Advanced Options for [ProductName]") advanced.title("Advanced Options for [ProductName]")
# A radio group with two options: allusers, justme # A radio group with two options: allusers, justme
advanced.checkbox("CompilePyc", 135, 60, 230, 50, 3, 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.event("EndDialog", "Return")
c = advanced.cancel("Cancel", "CompilePyc")
c.event("SpawnDialog", "CancelDlg")
##################################################################### #####################################################################
# Existing Directory dialog # Existing Directory dialog
dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title, dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title,