diff options
| author | csabella <cheryl.sabella@gmail.com> | 2017-07-31 05:30:09 -0400 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-07-31 12:30:09 +0300 |
| commit | a568e5273382a5dca0c27274f7d8e34c41a87d4d (patch) | |
| tree | 6fa43e8c6a12bbea985daa66c8e16f7884051169 /Lib | |
| parent | e8eb17b2c11dcd1550a94b175e557c234a804482 (diff) | |
| download | cpython-git-a568e5273382a5dca0c27274f7d8e34c41a87d4d.tar.gz | |
bpo-25684: ttk.OptionMenu radiobuttons weren't unique (#2276)
between instances of OptionMenu.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_extensions.py | 25 | ||||
| -rw-r--r-- | Lib/tkinter/ttk.py | 3 |
2 files changed, 27 insertions, 1 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py index 218b27fc30..a45f882bb0 100644 --- a/Lib/tkinter/test/test_ttk/test_extensions.py +++ b/Lib/tkinter/test/test_ttk/test_extensions.py @@ -291,6 +291,31 @@ class OptionMenuTest(AbstractTkTest, unittest.TestCase): optmenu.destroy() + def test_unique_radiobuttons(self): + # check that radiobuttons are unique across instances (bpo25684) + items = ('a', 'b', 'c') + default = 'a' + optmenu = ttk.OptionMenu(self.root, self.textvar, default, *items) + textvar2 = tkinter.StringVar(self.root) + optmenu2 = ttk.OptionMenu(self.root, textvar2, default, *items) + optmenu.pack() + optmenu.wait_visibility() + optmenu2.pack() + optmenu2.wait_visibility() + optmenu['menu'].invoke(1) + optmenu2['menu'].invoke(2) + optmenu_stringvar_name = optmenu['menu'].entrycget(0, 'variable') + optmenu2_stringvar_name = optmenu2['menu'].entrycget(0, 'variable') + self.assertNotEqual(optmenu_stringvar_name, + optmenu2_stringvar_name) + self.assertEqual(self.root.tk.globalgetvar(optmenu_stringvar_name), + items[1]) + self.assertEqual(self.root.tk.globalgetvar(optmenu2_stringvar_name), + items[2]) + + optmenu.destroy() + optmenu2.destroy() + tests_gui = (LabeledScaleTest, OptionMenuTest) diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index cbaad76e00..3ecc004f0e 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -1635,7 +1635,8 @@ class OptionMenu(Menubutton): menu.delete(0, 'end') for val in values: menu.add_radiobutton(label=val, - command=tkinter._setit(self._variable, val, self._callback)) + command=tkinter._setit(self._variable, val, self._callback), + variable=self._variable) if default: self._variable.set(default) |