X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/notebmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 28e18d9174..414bc978f9 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -19,11 +19,11 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/image.h" #endif #include "wx/string.h" #include "wx/imaglist.h" -#include "wx/image.h" #include "wx/mac/uma.h" @@ -80,6 +80,9 @@ bool wxNotebook::Create( wxWindow *parent, { m_macIsUserPane = false ; + if (! (style & wxBK_ALIGN_MASK)) + style |= wxBK_TOP; + if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) ) return false; @@ -373,9 +376,9 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const // we cannot differentiate better if (resultV >= 0) - *flags |= wxNB_HITTEST_ONLABEL; + *flags |= wxBK_HITTEST_ONLABEL; else - *flags |= wxNB_HITTEST_NOWHERE; + *flags |= wxBK_HITTEST_NOWHERE; } return resultV;