summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-01-23 21:29:18 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-01-23 21:29:18 (GMT)
commitf97f966abdb154039f603a3cb313d31e022a9a89 (patch)
tree486650609c5ff5ec94246172cfe3c76f065aa1d0 /generic
parentff8b5479baab369fa6163bf42b9928dcb482261f (diff)
parent3000865931e61dd77e966d0af27b4c86dcdbfaad (diff)
downloadtk-f97f966abdb154039f603a3cb313d31e022a9a89.zip
tk-f97f966abdb154039f603a3cb313d31e022a9a89.tar.gz
tk-f97f966abdb154039f603a3cb313d31e022a9a89.tar.bz2
merge 8.5
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;