diff options
author | Ned Deily <nad@acm.org> | 2012-10-22 22:13:01 (GMT) |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2012-10-22 22:13:01 (GMT) |
commit | e3d47128c5b1b10bc3c1e4b9fadfd9bcc08c844c (patch) | |
tree | cd8f8448a5f71b7635d1be3bf01a1312dd3125b0 /Lib/idlelib | |
parent | 3dd8cbea9bf4bc4e28eee32dfb3a1bcfba495921 (diff) | |
download | cpython-e3d47128c5b1b10bc3c1e4b9fadfd9bcc08c844c.zip cpython-e3d47128c5b1b10bc3c1e4b9fadfd9bcc08c844c.tar.gz cpython-e3d47128c5b1b10bc3c1e4b9fadfd9bcc08c844c.tar.bz2 |
Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
with certain versions of Tk 8.5. Initial patch by Kevin Walzer.
Diffstat (limited to 'Lib/idlelib')
-rw-r--r-- | Lib/idlelib/NEWS.txt | 3 | ||||
-rw-r--r-- | Lib/idlelib/configDialog.py | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 818ff14..080f98e 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -15,6 +15,9 @@ What's New in IDLE 2.7.4? - Issue #14018: Update checks for unstable system Tcl/Tk versions on OS X to include versions shipped with OS X 10.7 and 10.8 in addition to 10.6. +- Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu + with certain versions of Tk 8.5. Initial patch by Kevin Walzer. + What's New in IDLE 2.7.3? ========================= diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index 11aac9e..9884d5e 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -832,10 +832,9 @@ class ConfigDialog(Toplevel): fontWeight=tkFont.BOLD else: fontWeight=tkFont.NORMAL - size=self.fontSize.get() - self.editFont.config(size=size, - weight=fontWeight,family=fontName) - self.textHighlightSample.configure(font=(fontName, size, fontWeight)) + newFont = (fontName, self.fontSize.get(), fontWeight) + self.labelFontSample.config(font=newFont) + self.textHighlightSample.configure(font=newFont) def SetHighlightTarget(self): if self.highlightTarget.get()=='Cursor': #bg not possible |