adding support for embedded controls in native toolbar

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index a14cbd6f7fd11f0867c7982403d6eee4d8d2c0ee..414bc978f95366947ab30371d039c703e670ad7e 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -18,12 +18,12 @@
 #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/string.h"
 #include "wx/imaglist.h"
 #include "wx/string.h"
 #include "wx/imaglist.h"

-#include "wx/image.h"

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


@@ -80,6 +80,9 @@ bool wxNotebook::Create( wxWindow *parent,
 {
     m_macIsUserPane = false ;
 
 {
     m_macIsUserPane = false ;
 

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

     if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
         return false;
 
     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)
 
         // we cannot differentiate better
         if (resultV >= 0)

-            *flags |= wxNB_HITTEST_ONLABEL;
+            *flags |= wxBK_HITTEST_ONLABEL;

         else
         else

-            *flags |= wxNB_HITTEST_NOWHERE;
+            *flags |= wxBK_HITTEST_NOWHERE;

     }
 
     return resultV;
     }
 
     return resultV;