diff options
| author | dgp <dgp@noemail.net> | 2016-01-23 21:29:18 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2016-01-23 21:29:18 (GMT) |
| commit | e79eb440de766cf0285052853470c24679a94d75 (patch) | |
| tree | 486650609c5ff5ec94246172cfe3c76f065aa1d0 /generic | |
| parent | b7416f467bc6c72fee6e749b6dd7048c705f85a5 (diff) | |
| parent | f037259dff385ff83f009407e1d4205a533328b3 (diff) | |
| download | tk-e79eb440de766cf0285052853470c24679a94d75.zip tk-e79eb440de766cf0285052853470c24679a94d75.tar.gz tk-e79eb440de766cf0285052853470c24679a94d75.tar.bz2 | |
merge 8.5
FossilOrigin-Name: e28a89f525ea34e7d8e33db30750f68da198663c
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkOption.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkOption.c b/generic/tkOption.c index bff799b..17989f8 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -559,7 +559,7 @@ Tk_GetOption( count -= levelPtr[-1].bases[currentStack]; } - if (currentStack && CLASS) { + if (currentStack & CLASS) { nodeId = winClassId; } else { nodeId = winNameId; |