Issue #15853: merge 3.2 -> 3.3
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 @@
- 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 @@
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