X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55da8bd1e13153b00337c97abeb8f999d8eb3211..3029e588e07095f1e8d8db2a7e475e431964536f:/src/mac/notebmac.cpp?ds=sidebyside

diff --git a/src/mac/notebmac.cpp b/src/mac/notebmac.cpp
index e6ef6104a0..5ed215b7ab 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;
         }
@@ -175,6 +175,9 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
+    if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
+        return false;
+
     Rect bounds ;
     Str255 title ;
 
@@ -202,7 +205,7 @@ wxNotebook::~wxNotebook()
     m_macControl = NULL ;
 }
 
-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
 {
     wxSize sizeTotal = sizePage;
 
@@ -634,7 +637,7 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
 }
 
 
-void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
+void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )
 {
 #if 0
     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection);