Fixed grid_columnconfigure() and grid_rowconfigure() methods of
Tkinter widgets to work in wantobjects=True mode.
This commit is contained in:
commit
22234dab05
|
@ -1339,6 +1339,21 @@ class Misc:
|
|||
args = args + (col2, row2)
|
||||
return self._getints(self.tk.call(*args)) or None
|
||||
bbox = grid_bbox
|
||||
|
||||
def _gridconvvalue(self, value):
|
||||
if isinstance(value, (str, _tkinter.Tcl_Obj)):
|
||||
try:
|
||||
svalue = str(value)
|
||||
if not svalue:
|
||||
return None
|
||||
elif '.' in svalue:
|
||||
return getdouble(svalue)
|
||||
else:
|
||||
return getint(svalue)
|
||||
except ValueError:
|
||||
pass
|
||||
return value
|
||||
|
||||
def _grid_configure(self, command, index, cnf, kw):
|
||||
"""Internal function."""
|
||||
if isinstance(cnf, str) and not kw:
|
||||
|
@ -1357,22 +1372,14 @@ class Misc:
|
|||
for i in range(0, len(words), 2):
|
||||
key = words[i][1:]
|
||||
value = words[i+1]
|
||||
if not value:
|
||||
value = None
|
||||
elif '.' in str(value):
|
||||
value = getdouble(value)
|
||||
else:
|
||||
value = getint(value)
|
||||
dict[key] = value
|
||||
dict[key] = self._gridconvvalue(value)
|
||||
return dict
|
||||
res = self.tk.call(
|
||||
('grid', command, self._w, index)
|
||||
+ options)
|
||||
if len(options) == 1:
|
||||
if not res: return None
|
||||
# In Tk 7.5, -width can be a float
|
||||
if '.' in res: return getdouble(res)
|
||||
return getint(res)
|
||||
return self._gridconvvalue(res)
|
||||
|
||||
def grid_columnconfigure(self, index, cnf={}, **kw):
|
||||
"""Configure column INDEX of a grid.
|
||||
|
||||
|
|
|
@ -28,6 +28,9 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #20635: Fixed grid_columnconfigure() and grid_rowconfigure() methods of
|
||||
Tkinter widgets to work in wantobjects=True mode.
|
||||
|
||||
- Issue #19612: On Windows, subprocess.Popen.communicate() now ignores
|
||||
OSError(22, 'Invalid argument') when writing input data into stdin, whereas
|
||||
the process already exited.
|
||||
|
|
Loading…
Reference in New Issue