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)
commitb30195c13343d28eb9f50b9966cff26e9deaa35e (patch)
tree486650609c5ff5ec94246172cfe3c76f065aa1d0 /generic
parent91a1927c96702b3b69a465befdf805931422b480 (diff)
parent28b92fa6d50c6cd5eb972d9b4f0019d96f819278 (diff)
downloadtk-b30195c13343d28eb9f50b9966cff26e9deaa35e.zip
tk-b30195c13343d28eb9f50b9966cff26e9deaa35e.tar.gz
tk-b30195c13343d28eb9f50b9966cff26e9deaa35e.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;