traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #15853: merge 3.3 -> default

This commit is contained in:
Ned Deily 2012-10-22 15:20:13 -07:00
parent 40d8078f41 b6d24d9746
commit a212114a96
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/idlelib/NEWS.txt
View File

@ -4,6 +4,9 @@ What's New in IDLE 3.4.0?
- Issue #16226: Fix IDLE Path Browser crash. - Issue #16226: Fix IDLE Path Browser crash.
(Patch by Roger Serwy) (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? What's New in IDLE 3.3.0?
========================= =========================

7
Lib/idlelib/configDialog.py
View File

@ -821,10 +821,9 @@ class ConfigDialog(Toplevel):
fontWeight=tkFont.BOLD fontWeight=tkFont.BOLD
else: else:
fontWeight=tkFont.NORMAL fontWeight=tkFont.NORMAL
size=self.fontSize.get() newFont = (fontName, self.fontSize.get(), fontWeight)
self.editFont.config(size=size, self.labelFontSample.config(font=newFont)
weight=fontWeight,family=fontName) self.textHighlightSample.configure(font=newFont)
self.textHighlightSample.configure(font=(fontName, size, fontWeight))
def SetHighlightTarget(self): def SetHighlightTarget(self):
if self.highlightTarget.get()=='Cursor': #bg not possible if self.highlightTarget.get()=='Cursor': #bg not possible