Issue #15853: merge 3.2 -> 3.3

ned-deily · ned-deily · commit b6d24d97467d · 2012-10-22T15:18:46.000-07:00
diff --git 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
@@ -821,10 +821,9 @@ def SetFontSample(self,event=None):
             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
