X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55da8bd1e13153b00337c97abeb8f999d8eb3211..be6577566570876c0c00621ff98c786d7c6de80e:/src/mac/notebmac.cpp diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp index e6ef6104a0..e620bc017b 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; } @@ -202,7 +202,7 @@ wxNotebook::~wxNotebook() m_macControl = NULL ; } -wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { wxSize sizeTotal = sizePage;