fix a precedence order problem

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index e6ef6104a006ef72f925a36708e7ded2831c3de3..2f60ca89c5fa7d783c7c656d687722a8749dfdd3 100644 (file)
--- 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 e6ef6104a006ef72f925a36708e7ded2831c3de3..2f60ca89c5fa7d783c7c656d687722a8749dfdd3 100644 (file)
--- 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;
         }