summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-23 19:46:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-23 19:46:08 (GMT)
commit3000865931e61dd77e966d0af27b4c86dcdbfaad (patch)
treef7cfea93454c1ff449ed8ad286f3f937e1fa401a
parent61276a830613eb1ed26aa90b4572e80b0caa64f3 (diff)
downloadtk-3000865931e61dd77e966d0af27b4c86dcdbfaad.zip
tk-3000865931e61dd77e966d0af27b4c86dcdbfaad.tar.gz
tk-3000865931e61dd77e966d0af27b4c86dcdbfaad.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;