[Python-checkins] python/dist/src/Lib/lib-tk FileDialog.py, 1.10, 1.11 SimpleDialog.py, 1.5, 1.6 Tkinter.py, 1.180, 1.181 tkSimpleDialog.py, 1.9, 1.10

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/lib-tk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14004

Modified Files:
	FileDialog.py SimpleDialog.py Tkinter.py tkSimpleDialog.py 
Log Message:
Wait for visibility before setting a grab. Fixes #946153.


Index: FileDialog.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/FileDialog.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FileDialog.py	12 Feb 2004 17:35:09 -0000	1.10
--- FileDialog.py	3 Aug 2004 18:36:25 -0000	1.11
***************
*** 120,123 ****
--- 120,124 ----
          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

Index: SimpleDialog.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/SimpleDialog.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SimpleDialog.py	22 Mar 2004 21:49:47 -0000	1.5
--- SimpleDialog.py	3 Aug 2004 18:36:25 -0000	1.6
***************
*** 65,68 ****
--- 65,69 ----
  
      def go(self):
+         self.root.wait_visibility()
          self.root.grab_set()
          self.root.mainloop()

Index: Tkinter.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** Tkinter.py	18 Jul 2004 06:14:44 -0000	1.180
--- Tkinter.py	3 Aug 2004 18:36:25 -0000	1.181
***************
*** 1547,1551 ****
      of an appliation. It has an associated Tcl interpreter."""
      _w = '.'
!     def __init__(self, screenName=None, baseName=None, className='Tk', useTk=1):
          """Return a new Toplevel widget on screen SCREENNAME. A new Tcl interpreter will
          be created. BASENAME will be used for the identification of the profile file (see
--- 1547,1552 ----
      of an appliation. It has an associated Tcl interpreter."""
      _w = '.'
!     def __init__(self, screenName=None, baseName=None, className='Tk',
!                  useTk=1, sync=0, use=None):
          """Return a new Toplevel widget on screen SCREENNAME. A new Tcl interpreter will
          be created. BASENAME will be used for the identification of the profile file (see
***************
*** 1566,1570 ****
                  baseName = baseName + ext
          interactive = 0
!         self.tk = _tkinter.create(screenName, baseName, className, interactive, wantobjects, useTk)
          if useTk:
              self._loadtk()
--- 1567,1571 ----
                  baseName = baseName + ext
          interactive = 0
!         self.tk = _tkinter.create(screenName, baseName, className, interactive, wantobjects, useTk, sync, use)
          if useTk:
              self._loadtk()

Index: tkSimpleDialog.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/lib-tk/tkSimpleDialog.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** tkSimpleDialog.py	6 Apr 2003 09:00:54 -0000	1.9
--- tkSimpleDialog.py	3 Aug 2004 18:36:25 -0000	1.10
***************
*** 62,65 ****
--- 62,66 ----
          self.buttonbox()
  
+         self.wait_visibility() # window needs to be visible for the grab
          self.grab_set()