Merged revisions 69542 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69542 | ronald.oussoren | 2009-02-12 17:02:11 +0100 (Thu, 12 Feb 2009) | 2 lines

  This fixes issue3883 (text on the buttons in the preferences panel for IDLE doesn't fit on OSX)
........

diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index a6b33a2947e0ed5ea83e5cda631555164aad02de..20ed8278b535cd0c02e5aa8873d3993062dcf8cb 100644 (file)
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -21,6 +21,7 @@ from idlelib.tabbedpages import TabbedPageSet
 from idlelib.keybindingDialog import GetKeysDialog
 from idlelib.configSectionNameDialog import GetCfgSectionNameDialog
 from idlelib.configHelpSourceEdit import GetHelpSourceDialog
+from idlelib import macosxSupport
 
 class ConfigDialog(Toplevel):
 
@@ -71,18 +72,27 @@ class ConfigDialog(Toplevel):
                 page_names=['Fonts/Tabs','Highlighting','Keys','General'])
         frameActionButtons = Frame(self,pady=2)
         #action buttons
+
+        if macosxSupport.runningAsOSXApp():
+            # Surpress the padx and pady arguments when
+            # running as IDLE.app, otherwise the text
+            # on these buttons will not be readable.
+            extraKwds={}
+        else:
+            extraKwds=dict(padx=6, pady=3)
+
         self.buttonHelp = Button(frameActionButtons,text='Help',
                 command=self.Help,takefocus=FALSE,
-                padx=6,pady=3)
+                **extraKwds)
         self.buttonOk = Button(frameActionButtons,text='Ok',
                 command=self.Ok,takefocus=FALSE,
-                padx=6,pady=3)
+                **extraKwds)
         self.buttonApply = Button(frameActionButtons,text='Apply',
                 command=self.Apply,takefocus=FALSE,
-                padx=6,pady=3)
+                **extraKwds)
         self.buttonCancel = Button(frameActionButtons,text='Cancel',
                 command=self.Cancel,takefocus=FALSE,
-                padx=6,pady=3)
+                **extraKwds)
         self.CreatePageFontTab()
         self.CreatePageHighlight()
         self.CreatePageKeys()