Add wait_visibility before grab_set. Fixes #946153.

diff --git a/Lib/lib-tk/FileDialog.py b/Lib/lib-tk/FileDialog.py
index 323dc29704b91e73e04a02c346a2a8b506d34b1c..6efbd477b645d546761775a34e85a237139d201d 100644 (file)
--- a/Lib/lib-tk/FileDialog.py
+++ b/Lib/lib-tk/FileDialog.py
@@ -119,6 +119,7 @@ class FileDialog:
         self.set_selection(default)
         self.filter_command()
         self.selection.focus_set()
+        self.top.wait_visibility() # window needs to be visible for the grab
         self.top.grab_set()
         self.how = None
         self.master.mainloop()          # Exited by self.quit(how)

diff --git a/Lib/lib-tk/SimpleDialog.py b/Lib/lib-tk/SimpleDialog.py
index bbd6b9f809156d481f3f7e81a3c4d30f0e36fc7e..c3c7fd4389ee7644418db802ecdc7be96dd120e3 100644 (file)
--- a/Lib/lib-tk/SimpleDialog.py
+++ b/Lib/lib-tk/SimpleDialog.py
@@ -64,6 +64,7 @@ class SimpleDialog:
         widget.deiconify() # Become visible at the desired location
 
     def go(self):
+        self.root.wait_visibility()
         self.root.grab_set()
         self.root.mainloop()
         self.root.destroy()

diff --git a/Lib/lib-tk/tkSimpleDialog.py b/Lib/lib-tk/tkSimpleDialog.py
index 01709d8103afc6b24f6a46b6d512071a562eef2e..4d11ce0209481f57e1e9c20aa5094e9e0037a085 100644 (file)
--- a/Lib/lib-tk/tkSimpleDialog.py
+++ b/Lib/lib-tk/tkSimpleDialog.py
@@ -61,6 +61,7 @@ class Dialog(Toplevel):
 
         self.buttonbox()
 
+        self.wait_visibility() # window needs to be visible for the grab
         self.grab_set()
 
         if not self.initial_focus:

diff --git a/Misc/NEWS b/Misc/NEWS
index df53b7682b1a09c18eab8a133795958b91d3b33b..0b2cc51e07d84c9a61116812c97eea8b9e5db9b3 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,8 @@ Extension modules
 Library
 -------
 
+- Patch #946153: Add wait_visibility before grab_set.
+
 - Patch #994595: urllib2 now recognizes Basic authentication even if
   other authentication schemes are offered.