X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90c0f5a958242295e950cbd1eedbae8f5309442d..03703fc0af3887c58fd83e7f993ccb32d1da2647:/src/univ/notebook.cpp?ds=sidebyside diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index 201b435eff..4fe59855e8 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __VMS -#pragma message disable unscomzer -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,10 +25,14 @@ #if wxUSE_NOTEBOOK -#include "wx/imaglist.h" #include "wx/notebook.h" + +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" +#endif + +#include "wx/imaglist.h" #include "wx/spinbutt.h" -#include "wx/dcmemory.h" #include "wx/univ/renderer.h" @@ -121,6 +121,9 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { + if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) + style |= wxBK_TOP; + if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) return false; @@ -582,7 +585,7 @@ void wxNotebook::DoDraw(wxControlRenderer *renderer) int wxNotebook::HitTest(const wxPoint& pt, long *flags) const { if ( flags ) - *flags = wxNB_HITTEST_NOWHERE; + *flags = wxBK_HITTEST_NOWHERE; // first check that it is in this window at all if ( !GetClientRect().Inside(pt) ) @@ -628,7 +631,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const if ( flags ) { // TODO: be more precise - *flags = wxNB_HITTEST_ONITEM; + *flags = wxBK_HITTEST_ONITEM; } return n;