summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2016-01-23 19:46:08 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2016-01-23 19:46:08 (GMT)
commitf037259dff385ff83f009407e1d4205a533328b3 (patch)
treef7cfea93454c1ff449ed8ad286f3f937e1fa401a /generic
parent6e830e2f6750c603a32082ae4a47b0ed6de76d6f (diff)
downloadtk-f037259dff385ff83f009407e1d4205a533328b3.zip
tk-f037259dff385ff83f009407e1d4205a533328b3.tar.gz
tk-f037259dff385ff83f009407e1d4205a533328b3.tar.bz2
(cherry-pick): Fixed bug [9e606527af] - && instead of & used in generic/tkOption.c
FossilOrigin-Name: 7068ebfa05c05cd166a24adb2d2f16150331f0b7
Diffstat (limited to 'generic')
-rw-r--r--generic/tkOption.c2
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;