diff options
| author | Ned Deily <nad@acm.org> | 2012-10-22 22:18:46 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-10-22 22:18:46 (GMT) |
| commit | b6d24d97467d2b4b74017c4812f7173f8021ece3 (patch) | |
| tree | 560d8aff8a9528d115f8a2e8a479d5f446ebc586 /Lib/idlelib | |
| parent | abb0febd0a79bee2f1ec7787d430a5446771a71b (diff) | |
| parent | fdf0f274e63ab45de33e81c016e97dc8640265e9 (diff) | |
| download | cpython-b6d24d97467d2b4b74017c4812f7173f8021ece3.zip cpython-b6d24d97467d2b4b74017c4812f7173f8021ece3.tar.gz cpython-b6d24d97467d2b4b74017c4812f7173f8021ece3.tar.bz2 | |
Issue #15853: merge 3.2 -> 3.3
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 292c5a0..f6e8917d 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -4,6 +4,9 @@ What's New in IDLE 3.3.1? - Issue #16226: Fix IDLE Path Browser crash. (Patch by Roger Serwy) +- 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 3.3.0? ========================= diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index 2701b42..434114e 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -821,10 +821,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 |