summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2016-01-23 19:46:08 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2016-01-23 19:46:08 (GMT)
commitc62d5e6db5b05436f99f8a04b3b03016d14c4b21 (patch)
treef7cfea93454c1ff449ed8ad286f3f937e1fa401a
parent2d29c136010771532a8beb925863fcd293f4de9d (diff)
downloadtk-c62d5e6db5b05436f99f8a04b3b03016d14c4b21.zip
tk-c62d5e6db5b05436f99f8a04b3b03016d14c4b21.tar.gz
tk-c62d5e6db5b05436f99f8a04b3b03016d14c4b21.tar.bz2
(cherry-pick): Fixed bug [9e606527af] - && instead of & used in generic/tkOption.c
-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;