wait_{variable,window,visibility}

register = _register

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 2c3390b090357292ad3c555945a01a85c128b8f2..f3f17e1deb887e962ff370009368d21af6dde09b 100644 (file)
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -79,6 +79,16 @@ class Misc:
                apply(self.tk.call, ('tk_menuBar', self._w) + args)
        def waitvar(self, name='PY_VAR'):
                self.tk.call('tkwait', 'variable', name)
+       wait_variable = waitvar
+       def wait_window(self, window=None):
+               if window == None:
+                       window = self
+               self.tk.call('tkwait', 'window', window._w)
+       def wait_visibility(self, window=None):
+               if window == None:
+                       window = self
+               self.tk.call('tkwait', 'visibility', window._w)
+
        def setvar(self, name='PY_VAR', value='1'):
                self.tk.setvar(name, value)
        def getvar(self, name='PY_VAR'):
@@ -331,6 +341,7 @@ class Misc:
                        name = name + func.func_name
                self.tk.createcommand(name, f)
                return name
+       register = _register
        def _root(self):
                w = self
                while w.master: w = w.master

diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py
index 2c3390b090357292ad3c555945a01a85c128b8f2..f3f17e1deb887e962ff370009368d21af6dde09b 100755 (executable)
--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -79,6 +79,16 @@ class Misc:
                apply(self.tk.call, ('tk_menuBar', self._w) + args)
        def waitvar(self, name='PY_VAR'):
                self.tk.call('tkwait', 'variable', name)
+       wait_variable = waitvar
+       def wait_window(self, window=None):
+               if window == None:
+                       window = self
+               self.tk.call('tkwait', 'window', window._w)
+       def wait_visibility(self, window=None):
+               if window == None:
+                       window = self
+               self.tk.call('tkwait', 'visibility', window._w)
+
        def setvar(self, name='PY_VAR', value='1'):
                self.tk.setvar(name, value)
        def getvar(self, name='PY_VAR'):
@@ -331,6 +341,7 @@ class Misc:
                        name = name + func.func_name
                self.tk.createcommand(name, f)
                return name
+       register = _register
        def _root(self):
                w = self
                while w.master: w = w.master