From: Ned Deily <nad@acm.org>
Date: Mon, 22 Oct 2012 22:14:31 +0000 (-0700)
Subject: Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
X-Git-Tag: v3.2.4rc1~417
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdf0f274e63ab45de33e81c016e97dc8640265e9;p=thirdparty%2FPython%2Fcpython.git

Issue #15853: Prevent IDLE crash on OS X when opening Preferences menu
with certain versions of Tk 8.5.  Initial patch by Kevin Walzer.
---

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 3160c74561d0..f234b64b853b 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -21,6 +21,9 @@ What's New in IDLE 3.2.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 3.2.3?
 =========================
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index 2701b42f43d5..434114e4d2a9 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