From feddd867de4b584685d58bd013ea84a4854745ca Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 29 May 2003 20:30:54 +0000 Subject: [PATCH] fix a precedence order problem git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/notebmac.cpp | 2 +- src/mac/notebmac.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index e6ef6104a0..2f60ca89c5 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -96,7 +96,7 @@ static inline int wxMacTabMargin(long nbStyle, long side) // but we have to special case wxNB_TOP since it is zero... if ( side == wxNB_TOP) { - if ( nbStyle != 0 && nbStyle & wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM) + if ( nbStyle != 0 && nbStyle & (wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM)) { return otherMargin; } diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index e6ef6104a0..2f60ca89c5 100644 --- a/src/mac/notebmac.cpp +++ b/src/mac/notebmac.cpp @@ -96,7 +96,7 @@ static inline int wxMacTabMargin(long nbStyle, long side) // but we have to special case wxNB_TOP since it is zero... if ( side == wxNB_TOP) { - if ( nbStyle != 0 && nbStyle & wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM) + if ( nbStyle != 0 && nbStyle & (wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM)) { return otherMargin; } -- 2.47.2