From e3416e6138a401c2b4cf563c935fe2788c1603f2 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sat, 26 Jul 2014 19:40:16 -0400 Subject: Reduce unnecessary 2.7 versus 3.4+ differences in idlelib/configDialog.py. 2009-02-02 51562 (27c589f09a21) merged Mac support revisions into 3.0. 2009-03-04 52014 (dc3d24824b60) merged slightly improved version into 2.7. Change 3.4+ to match the later 2.7 patch. Buttons tested manually. --- Lib/idlelib/configDialog.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index 69dbebf..f28ef3a 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -79,28 +79,26 @@ class ConfigDialog(Toplevel): page_names=['Fonts/Tabs','Highlighting','Keys','General']) frameActionButtons = Frame(self,pady=2) #action buttons - if macosxSupport.isAquaTk(): - # Surpress the padx and pady arguments when - # running as IDLE.app, otherwise the text - # on these buttons will not be readable. - extraKwds={} + # Changing the default padding on OSX results in unreadable + # text in the buttons + paddingArgs={} else: - extraKwds=dict(padx=6, pady=3) + paddingArgs={'padx':6, 'pady':3} # Comment out button creation and packing until implement self.Help ## self.buttonHelp = Button(frameActionButtons,text='Help', ## command=self.Help,takefocus=FALSE, -## **extraKwds) +## **paddingArgs) self.buttonOk = Button(frameActionButtons,text='Ok', command=self.Ok,takefocus=FALSE, - **extraKwds) + **paddingArgs) self.buttonApply = Button(frameActionButtons,text='Apply', command=self.Apply,takefocus=FALSE, - **extraKwds) + **paddingArgs) self.buttonCancel = Button(frameActionButtons,text='Cancel', command=self.Cancel,takefocus=FALSE, - **extraKwds) + **paddingArgs) self.CreatePageFontTab() self.CreatePageHighlight() self.CreatePageKeys() -- cgit v0.12