gh-112898: Fix double close dialog with warning about unsafed files

Lib/idlelib/config.py

@@ -31,6 +31,7 @@
 
 from tkinter.font import Font
 import idlelib
+from idlelib import macosx
 
 class InvalidConfigType(Exception): pass
 class InvalidConfigSet(Exception): pass
@@ -660,6 +661,9 @@ def GetCoreKeys(self, keySetName=None):
             '<<zoom-height>>': ['<Alt-Key-2>'],
             }
 
+        if macosx.isAquaTk():
+            del keyBindings['<<close-all-windows>>']
+
         if keySetName:
             if not (self.userCfg['keys'].has_section(keySetName) or
                     self.defaultCfg['keys'].has_section(keySetName)):

Lib/idlelib/macosx.py

@@ -13,6 +13,10 @@
 
 _tk_type = None
 
+def _on_quit():
+    # on quit callback, overridden in setupApp
+    pass
+
 def _init_tk_type():
     """ Initialize _tk_type for isXyzTk functions.
 
@@ -34,6 +38,12 @@ def _init_tk_type():
                 return
 
         root = tkinter.Tk()
+
+        # Add an ::tk::mac::Quit command to the root because Tk
+        # seem to only call the quit command created in the 
+        # first `tkinter.Tk` instance.
+        root.createcommand('::tk::mac::Quit', lambda: _on_quit())
+
         ws = root.tk.call('tk', 'windowingsystem')
         if 'x11' in ws:
             _tk_type = "xquartz"
@@ -158,6 +168,7 @@ def overrideRootMenu(root, flist):
     from idlelib import mainmenu
     from idlelib import window
 
+
     closeItem = mainmenu.menudefs[0][1][-2]
 
     # Remove the last 3 items of the file menu: a separator, close window and
@@ -216,13 +227,13 @@ def help_dialog(event=None):
     root.bind('<<open-config-dialog>>', config_dialog)
     root.createcommand('::tk::mac::ShowPreferences', config_dialog)
     if flist:
-        root.bind('<<close-all-windows>>', flist.close_all_callback)
-
-        # The binding above doesn't reliably work on all versions of Tk
-        # on macOS. Adding command definition below does seem to do the
-        # right thing for now.
         root.createcommand('::tk::mac::Quit', flist.close_all_callback)
 
+        # Override the _on_quit helper, see comment in
+        # _init_tk_type for the background on this
+        global _on_quit
+        _on_quit = flist.close_all_callback
+
     if isCarbonTk():
         # for Carbon AquaTk, replace the default Tk apple menu
         menu = Menu(menubar, name='apple', tearoff=0)