]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorTerry Jan Reedy <tjreedy@udel.edu>
Sat, 11 Jun 2016 06:06:40 +0000 (02:06 -0400)
committerTerry Jan Reedy <tjreedy@udel.edu>
Sat, 11 Jun 2016 06:06:40 +0000 (02:06 -0400)
1  2 
Lib/idlelib/PyShell.py

index 38c12cd8bfc062c5f13576c0e9f21696fa04ee87,5dec68e58088b7af42e4009b2f3c4999e44a78ab..0f7a01d77ba276de644d2f50aea52d684e21f397
@@@ -1551,9 -1557,17 +1564,9 @@@ def main()
          root.wm_iconphoto(True, *icons)
  
      fixwordbreaks(root)
-     root.withdraw()
+     fix_x11_paste(root)
      flist = PyShellFileList(root)
 -    macosxSupport.setupApp(root, flist)
 -
 -    if macosxSupport.isAquaTk():
 -        # There are some screwed up <2> class bindings for text
 -        # widgets defined in Tk which we need to do away with.
 -        # See issue #24801.
 -        root.unbind_class('Text', '<B2>')
 -        root.unbind_class('Text', '<B2-Motion>')
 -        root.unbind_class('Text', '<<PasteSelection>>')
 +    macosx.setupApp(root, flist)
  
      if enable_edit:
          if not (cmd or script):