summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-01-20 22:03:33 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-01-20 22:03:33 (GMT)
commit05fb4fb354a81a939be50ee1eea487e58cd6e5b6 (patch)
tree530692b4b7fa24dc82f9bf2fd812df36641b1554 /generic
parentc1d11ea280efc1d70e599d7237cf84235c715064 (diff)
downloadtk-05fb4fb354a81a939be50ee1eea487e58cd6e5b6.zip
tk-05fb4fb354a81a939be50ee1eea487e58cd6e5b6.tar.gz
tk-05fb4fb354a81a939be50ee1eea487e58cd6e5b6.tar.bz2
Fixed bug [9e606527af] - && instead of & used in generic/tkOption.c
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 d758b6f..680c9db 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -560,7 +560,7 @@ Tk_GetOption(
count -= levelPtr[-1].bases[currentStack];
}
- if (currentStack && CLASS) {
+ if (currentStack & CLASS) {
nodeId = winClassId;
} else {
nodeId = winNameId;