summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2024-06-07 10:49:07 (GMT)
committerGitHub <noreply@github.com>2024-06-07 10:49:07 (GMT)
commitd68a22e7a68ae09f7db61d5a1a3bd9c0360cf3ee (patch)
tree5a93a33dba06a470ad22c0310780a5758f3e9ec1 /Lib/tkinter
parent6646a9da26d12fc54263b22dd2916a2f710f1db7 (diff)
downloadcpython-d68a22e7a68ae09f7db61d5a1a3bd9c0360cf3ee.zip
cpython-d68a22e7a68ae09f7db61d5a1a3bd9c0360cf3ee.tar.gz
cpython-d68a22e7a68ae09f7db61d5a1a3bd9c0360cf3ee.tar.bz2
gh-120211: Fix tkinter.ttk with Tcl/Tk 9.0 (GH-120213)
* Use new methods for tracing Tcl variable. * Fix Combobox.current() for empty combobox.
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/ttk.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py
index 5ca938a..073b3ae 100644
--- a/Lib/tkinter/ttk.py
+++ b/Lib/tkinter/ttk.py
@@ -690,7 +690,10 @@ class Combobox(Entry):
returns the index of the current value in the list of values
or -1 if the current value does not appear in the list."""
if newindex is None:
- return self.tk.getint(self.tk.call(self._w, "current"))
+ res = self.tk.call(self._w, "current")
+ if res == '':
+ return -1
+ return self.tk.getint(res)
return self.tk.call(self._w, "current", newindex)
@@ -1522,7 +1525,7 @@ class LabeledScale(Frame):
self.label.place(anchor='n' if label_side == 'top' else 's')
# update the label as scale or variable changes
- self.__tracecb = self._variable.trace_variable('w', self._adjust)
+ self.__tracecb = self._variable.trace_add('write', self._adjust)
self.bind('<Configure>', self._adjust)
self.bind('<Map>', self._adjust)
@@ -1530,7 +1533,7 @@ class LabeledScale(Frame):
def destroy(self):
"""Destroy this widget and possibly its associated variable."""
try:
- self._variable.trace_vdelete('w', self.__tracecb)
+ self._variable.trace_remove('write', self.__tracecb)
except AttributeError:
pass
else: