[ 1563875 ] wxTreeCtrl::FindItem asserts when item not found

[wxWidgets.git] / src / mac / classic / notebmac.cpp

diff --git a/src/mac/classic/notebmac.cpp b/src/mac/classic/notebmac.cpp
index ed9c0cf22fdd94bbdab278b514a23a8649aaaa10..3bf911dd74b9c58608b5a107186276fb582246c2 100644 (file)
--- a/src/mac/classic/notebmac.cpp
+++ b/src/mac/classic/notebmac.cpp
@@ -24,11 +24,11 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/app.h"

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/image.h"

 #include "wx/mac/uma.h"
 // ----------------------------------------------------------------------------
 // macros
 #include "wx/mac/uma.h"
 // ----------------------------------------------------------------------------
 // macros


@@ -187,6 +187,9 @@ bool wxNotebook::Create(wxWindow *parent,
     Rect bounds ;
     Str255 title ;
 
     Rect bounds ;
     Str255 title ;
 

+    if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+        style |= wxBK_TOP;
+

     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
     int tabstyle = kControlTabSmallNorthProc ;
     MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
     int tabstyle = kControlTabSmallNorthProc ;