From 8535b29f39a2ac7b45e6baaeeb300e5222dca05d Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 10 Sep 1996 12:36:34 +0000 Subject: [PATCH] compatibility changes suggested by Jack, for tk_menuBar and tk_bindForTraversal (i.e. don't call these for Tk >= 4.1) --- Lib/lib-tk/Tkinter.py | 6 ++++-- Lib/tkinter/Tkinter.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py index fd25c8420aa..0892a697c39 100644 --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -139,7 +139,8 @@ class Misc: return self.tk.getboolean(self.tk.call( 'set', 'tk_strictMotif', boolean)) def tk_menuBar(self, *args): - apply(self.tk.call, ('tk_menuBar', self._w) + args) + if TkVersion < 4.1: + apply(self.tk.call, ('tk_menuBar', self._w) + args) def wait_variable(self, name='PY_VAR'): self.tk.call('tkwait', 'variable', name) waitvar = wait_variable # XXX b/w compat @@ -1217,7 +1218,8 @@ class Menu(Widget): def __init__(self, master=None, cnf={}, **kw): Widget.__init__(self, master, 'menu', cnf, kw) def tk_bindForTraversal(self): - self.tk.call('tk_bindForTraversal', self._w) + if TkVersion < 4.1: + self.tk.call('tk_bindForTraversal', self._w) def tk_mbPost(self): self.tk.call('tk_mbPost', self._w) def tk_mbUnpost(self): diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py index fd25c8420aa..0892a697c39 100755 --- a/Lib/tkinter/Tkinter.py +++ b/Lib/tkinter/Tkinter.py @@ -139,7 +139,8 @@ class Misc: return self.tk.getboolean(self.tk.call( 'set', 'tk_strictMotif', boolean)) def tk_menuBar(self, *args): - apply(self.tk.call, ('tk_menuBar', self._w) + args) + if TkVersion < 4.1: + apply(self.tk.call, ('tk_menuBar', self._w) + args) def wait_variable(self, name='PY_VAR'): self.tk.call('tkwait', 'variable', name) waitvar = wait_variable # XXX b/w compat @@ -1217,7 +1218,8 @@ class Menu(Widget): def __init__(self, master=None, cnf={}, **kw): Widget.__init__(self, master, 'menu', cnf, kw) def tk_bindForTraversal(self): - self.tk.call('tk_bindForTraversal', self._w) + if TkVersion < 4.1: + self.tk.call('tk_bindForTraversal', self._w) def tk_mbPost(self): self.tk.call('tk_mbPost', self._w) def tk_mbUnpost(self):