64bit fix for patch as well

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 7de1af74e19ff94565bb00f9d9e62186556c385a..2aff7f536bec91cc4097873e4528be3dc9828217 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        notebook.cpp
+// Name:        src/mac/carbon/notebmac.cpp

 // Purpose:     implementation of wxNotebook
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     implementation of wxNotebook
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,42 +9,33 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "notebook.h"
-#endif
+#include "wx/wxprec.h"

 
 

-// ============================================================================
-// declarations
-// ============================================================================
+#if wxUSE_NOTEBOOK
+
+#include "wx/notebook.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/image.h"
+#endif

 
 

-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#include "wx/app.h"

 #include "wx/string.h"
 #include "wx/string.h"

-#include "wx/log.h"

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

-#include "wx/image.h"
-#include "wx/notebook.h"

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

-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
+

 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 
 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 

-// ----------------------------------------------------------------------------
-// event table
-// ----------------------------------------------------------------------------
-

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)

-    EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
-    EVT_MOUSE_EVENTS(wxNotebook::OnMouse)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)

 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)


@@ -54,98 +45,10 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-// The Appearance Manager docs show using tab controls in either edge to edge
-// mode, or inset.  I think edge to edge conforms better to the other ports,
-// and inset mode is better accomplished with space around the wxNotebook rather
-// than within it.    --Robin
-
-// CS : had to switch off tight spacing due to 10.3 problems
-#define wxMAC_EDGE_TO_EDGE 0
-
-static inline int wxMacTabMargin(long nbStyle, long side)
-{
-    static int tabMargin = -1;
-    static int otherMargin = -1;
-
-    if ( tabMargin == -1)
-    {
-        if ( UMAHasAquaLayout() )
-        {
-            tabMargin = 26;    // From Appearance Manager docs for small tab control dimensions
-#if wxMAC_EDGE_TO_EDGE
-            otherMargin = 0;
-#else
-            otherMargin = 20;
-#endif
-        }
-        else
-        {
-            tabMargin = 30;
-#if wxMAC_EDGE_TO_EDGE
-            otherMargin = 0;
-#else
-            otherMargin = 16;
-#endif
-        }
-    }
-
-    // If the style matches the side asked for then return the tab margin,
-    // 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))
-        {
-            return otherMargin;
-        }
-        else
-        {
-            return tabMargin;
-        }
-    }
-    else if ( nbStyle & side)
-        return tabMargin;
-    else
-        return otherMargin;
-}
-
-static inline int wxMacTabLeftMargin(long style)
-{
-    return wxMacTabMargin(style, wxNB_LEFT);
-}
-
-static inline int wxMacTabTopMargin(long style)
-{
-    return wxMacTabMargin(style, wxNB_TOP);
-}
-
-static inline int wxMacTabRightMargin(long style)
-{
-    return wxMacTabMargin(style, wxNB_RIGHT);
-}
-
-static inline int wxMacTabBottomMargin(long style)
-{
-    return wxMacTabMargin(style, wxNB_BOTTOM);
-}
-
-// ----------------------------------------------------------------------------
-// wxNotebook construction
-// ----------------------------------------------------------------------------

 
 // common part of all ctors
 void wxNotebook::Init()
 {
 
 // common part of all ctors
 void wxNotebook::Init()
 {

-    if ( UMAHasAquaLayout() )
-    {
-        // Should these depend on wxMAC_EDGE_TO_EDGE too?
-        m_macHorizontalBorder = 7;
-        m_macVerticalBorder = 8;
-    }
-

     m_nSelection = -1;
 }
 
     m_nSelection = -1;
 }
 


@@ -156,88 +59,81 @@ wxNotebook::wxNotebook()
 }
 
 // the same arguments as for wxControl
 }
 
 // the same arguments as for wxControl

-wxNotebook::wxNotebook(wxWindow *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxString& name)
+wxNotebook::wxNotebook( wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )

 {
     Init();
 
 {
     Init();
 

-    Create(parent, id, pos, size, style, name);
+    Create( parent, id, pos, size, style, name );

 }
 
 }
 

-// Create() function
-bool wxNotebook::Create(wxWindow *parent,
-                        wxWindowID id,
-                        const wxPoint& pos,
-                        const wxSize& size,
-                        long style,
-                        const wxString& name)
+bool wxNotebook::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )

 {
 {

-    if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
-        return false;
-
-    Rect bounds ;
-    Str255 title ;
+    m_macIsUserPane = false ;

 
 

-    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+    if (! (style & wxBK_ALIGN_MASK))
+        style |= wxBK_TOP;

 
 

-    int tabstyle = kControlTabSmallNorthProc ;
-    if ( HasFlag(wxNB_LEFT) )
-        tabstyle = kControlTabSmallWestProc ;
-    else if ( HasFlag( wxNB_RIGHT ) )
-        tabstyle = kControlTabSmallEastProc ;
-    else if ( HasFlag( wxNB_BOTTOM ) )
-        tabstyle = kControlTabSmallSouthProc ;
+    if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
+        return false;

 
 

+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );

 
 

-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,
-        tabstyle , (long) this ) ;
+    if ( bounds.right <= bounds.left )
+        bounds.right = bounds.left + 100;
+    if ( bounds.bottom <= bounds.top )
+        bounds.bottom = bounds.top + 100;

 
 

-    MacPostControlCreate() ;
-    return TRUE ;
-}
+    UInt16 tabstyle = kControlTabDirectionNorth;
+    if ( HasFlag(wxBK_LEFT) )
+        tabstyle = kControlTabDirectionWest;
+    else if ( HasFlag( wxBK_RIGHT ) )
+        tabstyle = kControlTabDirectionEast;
+    else if ( HasFlag( wxBK_BOTTOM ) )
+        tabstyle = kControlTabDirectionSouth;

 
 

-// dtor
-wxNotebook::~wxNotebook()
-{
-}
+    ControlTabSize tabsize;
+    switch (GetWindowVariant())
+    {
+        case wxWINDOW_VARIANT_MINI:
+            if ( UMAGetSystemVersion() >= 0x1030 )
+                tabsize = 3 ;
+            else
+                tabsize = kControlSizeSmall;
+            break;

 
 

-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
-{
-    wxSize sizeTotal = sizePage;
+        case wxWINDOW_VARIANT_SMALL:
+            tabsize = kControlTabSizeSmall;
+            break;

 
 

-    int major,minor;
-    wxGetOsVersion( &major, &minor );
+        default:
+            tabsize = kControlTabSizeLarge;
+            break;
+    }

 
 

-    // Mac has large notebook borders. Aqua even more so.
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateTabsControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+        tabsize, tabstyle, 0, NULL, m_peer->GetControlRefAddr() );
+    verify_noerr( err );

 
 

-    if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
-    {
-        sizeTotal.x += 90;
+    MacPostControlCreate( pos, size );

 
 

-        if (major >= 10)
-            sizeTotal.y += 28;
-        else
-            sizeTotal.y += 20;
-    }
-    else
-    {
-        if (major >= 10)
-        {
-            sizeTotal.x += 34;
-            sizeTotal.y += 46;
-        }
-        else
-        {
-            sizeTotal.x += 22;
-            sizeTotal.y += 44;
-        }
-    }
+    return true ;
+}

 
 

-    return sizeTotal;
+// dtor
+wxNotebook::~wxNotebook()
+{

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -246,45 +142,52 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
 
 void wxNotebook::SetPadding(const wxSize& padding)
 {
 
 void wxNotebook::SetPadding(const wxSize& padding)
 {

-    wxFAIL_MSG( wxT("wxNotebook::SetPadding not implemented") );
+    // unsupported by OS

 }
 
 void wxNotebook::SetTabSize(const wxSize& sz)
 {
 }
 
 void wxNotebook::SetTabSize(const wxSize& sz)
 {

-    wxFAIL_MSG( wxT("wxNotebook::SetTabSize not implemented") );
+    // unsupported by OS

 }
 
 void wxNotebook::SetPageSize(const wxSize& size)
 {
 }
 
 void wxNotebook::SetPageSize(const wxSize& size)
 {

-    wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
+    SetSize( CalcSizeFromPage( size ) );
+}
+
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    return DoGetSizeFromClientSize( sizePage );

 }
 
 }
 

-int wxNotebook::SetSelection(size_t nPage)
+int wxNotebook::DoSetSelection(size_t nPage, int flags)

 {
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") );

 
 

-    if ( int(nPage) != m_nSelection )
+    if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )

     {
     {

-        wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId);
-        event.SetSelection(nPage);
-        event.SetOldSelection(m_nSelection);
-        event.SetEventObject(this);
-        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+        if ( flags & SetSelection_SendEvent )

         {
         {

-            // program allows the page change
-            event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
-            (void)GetEventHandler()->ProcessEvent(event);
+            if ( !SendPageChangingEvent(nPage) )
+            {
+                // vetoed by program
+                return m_nSelection;
+            }
+            //else: program allows the page change

 
 

-            ChangePage(m_nSelection, nPage);
+            SendPageChangedEvent(m_nSelection, nPage);

         }
         }

+
+        ChangePage(m_nSelection, nPage);

     }
     }

+    //else: no change

 
     return m_nSelection;
 }
 
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {
 
     return m_nSelection;
 }
 
 bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 {

-    wxASSERT( IS_VALID_PAGE(nPage) );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("SetPageText: invalid notebook page") );

 
     wxNotebookPage *page = m_pages[nPage];
     page->SetLabel(strText);
 
     wxNotebookPage *page = m_pages[nPage];
     page->SetLabel(strText);


@@ -295,25 +198,26 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {

-    wxASSERT( IS_VALID_PAGE(nPage) );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("GetPageText: invalid notebook page") );

 
     wxNotebookPage *page = m_pages[nPage];
 
     wxNotebookPage *page = m_pages[nPage];

+

     return page->GetLabel();
 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {
     return page->GetLabel();
 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("GetPageImage: invalid notebook page") );

 
     return m_images[nPage];
 }
 
 bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 {
 
     return m_images[nPage];
 }
 
 bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 {

-    wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
-
-    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,
-        _T("invalid image index in SetPageImage()") );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), false,
+        wxT("SetPageImage: invalid notebook page") );
+    wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false,
+        wxT("SetPageImage: invalid image index") );

 
     if ( nImage != m_images[nPage] )
     {
 
     if ( nImage != m_images[nPage] )
     {


@@ -325,7 +229,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
         MacSetupTabs() ;
     }
 
         MacSetupTabs() ;
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -335,18 +239,22 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 // remove one page from the notebook, without deleting the window
 wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 {
 // remove one page from the notebook, without deleting the window
 wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)
 {

-    wxCHECK( IS_VALID_PAGE(nPage), NULL );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL,
+        wxT("DoRemovePage: invalid notebook page") );
+

     wxNotebookPage* page = m_pages[nPage] ;
     m_pages.RemoveAt(nPage);
 
     MacSetupTabs();
 
     wxNotebookPage* page = m_pages[nPage] ;
     m_pages.RemoveAt(nPage);
 
     MacSetupTabs();
 

-    if(m_nSelection >= (int)GetPageCount()) {
+    if (m_nSelection >= (int)GetPageCount())

         m_nSelection = GetPageCount() - 1;
         m_nSelection = GetPageCount() - 1;

-    }
-    if(m_nSelection >= 0) {
+
+    if (m_nSelection >= 0)

         m_pages[m_nSelection]->Show(true);
         m_pages[m_nSelection]->Show(true);

-    }
+
+    InvalidateBestSize();
+

     return page;
 }
 
     return page;
 }
 


@@ -356,42 +264,36 @@ bool wxNotebook::DeleteAllPages()
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     m_nSelection = -1 ;
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     m_nSelection = -1 ;

-    return TRUE;
-}
+    InvalidateBestSize();

 
 

+    return true;
+}

 
 // same as AddPage() but does it at given position
 bool wxNotebook::InsertPage(size_t nPage,
 
 // same as AddPage() but does it at given position
 bool wxNotebook::InsertPage(size_t nPage,

-                            wxNotebookPage *pPage,
-                            const wxString& strText,
-                            bool bSelect,
-                            int imageId)
+    wxNotebookPage *pPage,
+    const wxString& strText,
+    bool bSelect,
+    int imageId )

 {
 {

-    if ( !wxNotebookBase::InsertPage(nPage, pPage, strText, bSelect, imageId) )
+    if ( !wxNotebookBase::InsertPage( nPage, pPage, strText, bSelect, imageId ) )

         return false;
 
         return false;
 

-    wxASSERT_MSG( pPage->GetParent() == this,
-                    _T("notebook pages must have notebook as parent") );
+    wxASSERT_MSG( pPage->GetParent() == this, wxT("notebook pages must have notebook as parent") );

 
     // don't show pages by default (we'll need to adjust their size first)
     pPage->Show( false ) ;
 
 
     // don't show pages by default (we'll need to adjust their size first)
     pPage->Show( false ) ;
 

-    pPage->SetLabel(strText);
+    pPage->SetLabel( strText );

 
 

-    m_images.Insert(imageId, nPage);
+    m_images.Insert( imageId, nPage );

 
     MacSetupTabs();
 
 
     MacSetupTabs();
 

-    int h, w;
-    GetSize(&w, &h);
-    pPage->SetSize(wxMacTabLeftMargin(GetWindowStyle()) + m_macHorizontalBorder,
-                   wxMacTabTopMargin(GetWindowStyle()) + m_macVerticalBorder,
-                   w - wxMacTabLeftMargin(GetWindowStyle()) - wxMacTabRightMargin(GetWindowStyle()) - 2*m_macHorizontalBorder,
-                   h - wxMacTabTopMargin(GetWindowStyle()) - wxMacTabBottomMargin(GetWindowStyle()) - 2*m_macVerticalBorder);
-    if ( pPage->GetAutoLayout() ) {
+    wxRect rect = GetPageRect() ;
+    pPage->SetSize( rect );
+    if ( pPage->GetAutoLayout() )

         pPage->Layout();
         pPage->Layout();

-    }
-

 
     // now deal with the selection
     // ---------------------------
 
     // now deal with the selection
     // ---------------------------


@@ -399,13 +301,14 @@ bool wxNotebook::InsertPage(size_t nPage,
     // if the inserted page is before the selected one, we must update the
     // index of the selected page
 
     // if the inserted page is before the selected one, we must update the
     // index of the selected page
 

-    if ( int(nPage) <= m_nSelection ) 
+    if ( int(nPage) <= m_nSelection )

     {
         m_nSelection++;
     {
         m_nSelection++;

+

         // while this still is the same page showing, we need to update the tabs
         // while this still is the same page showing, we need to update the tabs

-        SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
+        m_peer->SetValue( m_nSelection + 1 ) ;

     }
     }

-    
+

     // some page should be selected: either this one or the first one if there
     // is still no selection
     int selNew = -1;
     // some page should be selected: either this one or the first one if there
     // is still no selection
     int selNew = -1;


@@ -415,75 +318,129 @@ bool wxNotebook::InsertPage(size_t nPage,
         selNew = 0;
 
     if ( selNew != -1 )
         selNew = 0;
 
     if ( selNew != -1 )

-        SetSelection(selNew);
+        SetSelection( selNew );
+
+    InvalidateBestSize();

 
     return true;
 }
 
 
     return true;
 }
 

-/* Added by Mark Newsam
-* When a page is added or deleted to the notebook this function updates
-* information held in the m_macControl so that it matches the order
-* the user would expect.
-*/
+int wxNotebook::HitTest(const wxPoint& pt, long * flags) const
+{
+    int resultV = wxNOT_FOUND;
+
+#if TARGET_API_MAC_OSX
+    const int countPages = GetPageCount();
+
+    // we have to convert from Client to Window relative coordinates
+    wxPoint adjustedPt = pt + GetClientAreaOrigin();
+    // and now to HIView native ones
+    adjustedPt.x -= MacGetLeftBorderSize() ;
+    adjustedPt.y -= MacGetTopBorderSize() ;
+
+    HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
+    HIViewPartCode outPart = 0 ;
+    OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+
+    int max = m_peer->GetMaximum() ;
+    if ( outPart == 0 && max > 0 )
+    {
+        // this is a hack, as unfortunately a hit on an already selected tab returns 0,
+        // so we have to go some extra miles to make sure we select something different
+        // and try again ..
+        int val = m_peer->GetValue() ;
+        int maxval = max ;
+        if ( max == 1 )
+        {
+            m_peer->SetMaximum( 2 ) ;
+            maxval = 2 ;
+        }
+
+        if ( val == 1 )
+            m_peer->SetValue( maxval ) ;
+        else
+             m_peer->SetValue( 1 ) ;
+
+        err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );
+
+        m_peer->SetValue( val ) ;
+        if ( max == 1 )
+            m_peer->SetMaximum( 1 ) ;
+    }
+
+    if ( outPart >= 1 && outPart <= countPages )
+        resultV = outPart - 1 ;
+#endif // TARGET_API_MAC_OSX
+
+    if (flags != NULL)
+    {
+        *flags = 0;
+
+        // we cannot differentiate better
+        if (resultV >= 0)
+            *flags |= wxBK_HITTEST_ONLABEL;
+        else
+            *flags |= wxBK_HITTEST_NOWHERE;
+    }
+
+    return resultV;
+}
+
+// Added by Mark Newsam
+// When a page is added or deleted to the notebook this function updates
+// information held in the control so that it matches the order
+// the user would expect.
+//

 void wxNotebook::MacSetupTabs()
 {
 void wxNotebook::MacSetupTabs()
 {

-    SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;
+    m_peer->SetMaximum( GetPageCount() ) ;

 
     wxNotebookPage *page;
 
     wxNotebookPage *page;

-    ControlTabInfoRec info;
+    ControlTabInfoRecV1 info;

 
     const size_t countPages = GetPageCount();
 
     const size_t countPages = GetPageCount();

-    for(size_t ii = 0; ii < countPages; ii++)
+    for (size_t ii = 0; ii < countPages; ii++)

     {
         page = m_pages[ii];
     {
         page = m_pages[ii];

-        info.version = 0;
+        info.version = kControlTabInfoVersionOne;

         info.iconSuiteID = 0;
         info.iconSuiteID = 0;

-        wxMacStringToPascal( page->GetLabel() , info.name ) ;
+        wxMacCFStringHolder cflabel( page->GetLabel(), m_font.GetEncoding() ) ;
+        info.name = cflabel ;
+        m_peer->SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;

 
 

-        SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
-            sizeof( ControlTabInfoRec) , (char*) &info ) ;
-        SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
-#if TARGET_CARBON

         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {
         if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 )
         {

-            // tab controls only support very specific types of images, therefore we are doing an odyssee
-            // accross the icon worlds (even Apple DTS did not find a shorter path)
-            // in order not to pollute the icon registry we put every icon into (OSType) 1 and immediately
-            // afterwards Unregister it (IconRef is ref counted, so it will stay on the tab even if we
-            // unregister it) in case this will ever lead to having the same icon everywhere add some kind
-            // of static counter
-            const wxBitmap* bmap = GetImageList()->GetBitmap( GetPageImage(ii ) ) ;
-            if ( bmap )
+            const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ;
+            if ( bmap.Ok() )

             {
             {

-                wxBitmap scaledBitmap ;
-                if ( bmap->GetWidth() != 16 || bmap->GetHeight() != 16 )
-                {
-                    scaledBitmap = wxBitmap( bmap->ConvertToImage().Scale(16,16) ) ;
-                    bmap = &scaledBitmap ;
-                }

                 ControlButtonContentInfo info ;
                 ControlButtonContentInfo info ;

-                wxMacCreateBitmapButton( &info , *bmap , kControlContentPictHandle) ;
-                IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(0) ;
-                OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
-                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-                IconRef iconRef ;
-                err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
-                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-                info.contentType = kControlContentIconRef ;
-                info.u.iconRef = iconRef ;
-                SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag,
-                    sizeof( info ), (Ptr)&info );
+
+                wxMacCreateBitmapButton( &info, bmap ) ;
+
+                OSStatus err = m_peer->SetData<ControlButtonContentInfo>( ii + 1, kControlTabImageContentTag, &info );

                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
                 wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;

-                   UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
-                ReleaseIconRef( iconRef ) ;
-                DisposeHandle( (Handle) iconFamily ) ;
+
+                wxMacReleaseBitmapButton( &info ) ;

             }
         }
             }
         }

-#endif
+
+        m_peer->SetTabEnabled( ii + 1, true ) ;

     }
     }

+
+#if wxMAC_USE_CORE_GRAPHICS
+    Refresh();
+#else

     Rect bounds;
     Rect bounds;

-    GetControlBounds((ControlHandle)m_macControl, &bounds);
-    InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds);
+    m_peer->GetRectInWindowCoords( &bounds ) ;
+    InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds );
+#endif
+}
+
+wxRect wxNotebook::GetPageRect() const
+{
+    wxSize size = GetClientSize() ;
+
+    return wxRect( 0 , 0 , size.x , size.y ) ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -494,28 +451,15 @@ void wxNotebook::MacSetupTabs()
 //     time because doing it in ::Create() doesn't work (for unknown reasons)
 void wxNotebook::OnSize(wxSizeEvent& event)
 {
 //     time because doing it in ::Create() doesn't work (for unknown reasons)
 void wxNotebook::OnSize(wxSizeEvent& event)
 {

-    // emulate page change (it's esp. important to do it first time because
-    // otherwise our page would stay invisible)
-    /*
-    int nSel = m_nSelection;
-    m_nSelection = -1;
-    SetSelection(nSel);
-    */
-
-    // fit the notebook page to the tab control's display area
-    int w, h;
-    GetSize(&w, &h);
-

     unsigned int nCount = m_pages.Count();
     unsigned int nCount = m_pages.Count();

-    for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
+    wxRect rect = GetPageRect() ;
+
+    for ( unsigned int nPage = 0; nPage < nCount; nPage++ )
+    {

         wxNotebookPage *pPage = m_pages[nPage];
         wxNotebookPage *pPage = m_pages[nPage];

-        pPage->SetSize(wxMacTabLeftMargin(GetWindowStyle()) + m_macHorizontalBorder,
-                       wxMacTabTopMargin(GetWindowStyle()) + m_macVerticalBorder,
-                       w - wxMacTabLeftMargin(GetWindowStyle()) - wxMacTabRightMargin(GetWindowStyle()) - 2*m_macHorizontalBorder,
-                       h - wxMacTabTopMargin(GetWindowStyle()) - wxMacTabBottomMargin(GetWindowStyle()) - 2*m_macVerticalBorder);
-        if ( pPage->GetAutoLayout() ) {
+        pPage->SetSize(rect);
+        if ( pPage->GetAutoLayout() )

             pPage->Layout();
             pPage->Layout();

-        }

     }
 
     // Processing continues to next OnSize
     }
 
     // Processing continues to next OnSize


@@ -543,11 +487,13 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event)
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {

-    if ( event.IsWindowChange() ) {
+    if ( event.IsWindowChange() )
+    {

         // change pages
         // change pages

-        AdvanceSelection(event.GetDirection());
+        AdvanceSelection( event.GetDirection() );

     }
     }

-    else {
+    else
+    {

         // we get this event in 2 cases
         //
         // a) one of our pages might have generated it because the user TABbed
         // we get this event in 2 cases
         //
         // a) one of our pages might have generated it because the user TABbed


@@ -562,7 +508,8 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         // from in this case and so can't choose between setting the focus to
         // first or last panel child
         wxWindow *parent = GetParent();
         // from in this case and so can't choose between setting the focus to
         // first or last panel child
         wxWindow *parent = GetParent();

-        // the cast is here to fic a GCC ICE
+
+        // the cast is here to fix a GCC ICE

         if ( ((wxWindow*)event.GetEventObject()) == parent )
         {
             // no, it doesn't come from child, case (b): forward to a page
         if ( ((wxWindow*)event.GetEventObject()) == parent )
         {
             // no, it doesn't come from child, case (b): forward to a page


@@ -570,10 +517,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
             {
                 // so that the page knows that the event comes from it's parent
                 // and is being propagated downwards
             {
                 // so that the page knows that the event comes from it's parent
                 // and is being propagated downwards

-                event.SetEventObject(this);
+                event.SetEventObject( this );

 
                 wxWindow *page = m_pages[m_nSelection];
 
                 wxWindow *page = m_pages[m_nSelection];

-                if ( !page->GetEventHandler()->ProcessEvent(event) )
+                if ( !page->GetEventHandler()->ProcessEvent( event ) )

                 {
                     page->SetFocus();
                 }
                 {
                     page->SetFocus();
                 }


@@ -588,9 +535,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         else
         {
             // it comes from our child, case (a), pass to the parent
         else
         {
             // it comes from our child, case (a), pass to the parent

-            if ( parent ) {
-                event.SetCurrentFocus(this);
-                parent->GetEventHandler()->ProcessEvent(event);
+            if ( parent )
+            {
+                event.SetCurrentFocus( this );
+                parent->GetEventHandler()->ProcessEvent( event );

             }
         }
     }
             }
         }
     }


@@ -606,13 +554,13 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 
 void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
 {
 
 void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))
 {

-  // don't set the sizes of the pages - their correct size is not yet known
-  wxControl::SetConstraintSizes(FALSE);
+    // don't set the sizes of the pages - their correct size is not yet known
+    wxControl::SetConstraintSizes( false );

 }
 
 bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 {
 }
 
 bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 {

-  return TRUE;
+    return true;

 }
 
 #endif // wxUSE_CONSTRAINTS
 }
 
 #endif // wxUSE_CONSTRAINTS


@@ -629,96 +577,53 @@ void wxNotebook::Command(wxCommandEvent& event)
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {
 // hide the currently active panel and show the new one
 void wxNotebook::ChangePage(int nOldSel, int nSel)
 {

-    if ( nOldSel != -1 ) 
-    {
-        m_pages[nOldSel]->Show(FALSE);
-    }
+    if (nOldSel == nSel)
+        return;
+
+    if ( nOldSel != -1 )
+        m_pages[nOldSel]->Show( false );

 
     if ( nSel != -1 )
     {
         wxNotebookPage *pPage = m_pages[nSel];
 
     if ( nSel != -1 )
     {
         wxNotebookPage *pPage = m_pages[nSel];

-        pPage->Show(TRUE);
+        pPage->Show( true );

         pPage->SetFocus();
     }
         pPage->SetFocus();
     }

-    
+

     m_nSelection = nSel;
     m_nSelection = nSel;

-    SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
+    m_peer->SetValue( m_nSelection + 1 ) ;

 }
 
 }
 

-
-void  wxNotebook::OnMouse( wxMouseEvent &event )
+wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
 {

-    if ( (ControlHandle) m_macControl == NULL )
-    {
-        event.Skip() ;
-        return ;
-    }
+    OSStatus status = eventNotHandledErr ;

 
 

-    if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+    SInt32 newSel = m_peer->GetValue() - 1 ;
+    if ( newSel != m_nSelection )

     {
     {

-        int x = event.m_x ;
-        int y = event.m_y ;
-
-        MacClientToRootWindow( &x , &y ) ;
-
-        ControlHandle   control ;
-        Point       localwhere ;
-        SInt16      controlpart ;
-
-        localwhere.h = x ;
-        localwhere.v = y ;
+        wxNotebookEvent changing(
+            wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
+            newSel , m_nSelection );
+        changing.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( changing );

 
 

-        short modifiers = 0;
-
-        if ( !event.m_leftDown && !event.m_rightDown )
-            modifiers  |= btnState ;
-
-        if ( event.m_shiftDown )
-            modifiers |= shiftKey ;
-
-        if ( event.m_controlDown )
-            modifiers |= controlKey ;
-
-        if ( event.m_altDown )
-            modifiers |= optionKey ;
-
-        if ( event.m_metaDown )
-            modifiers |= cmdKey ;
-
-        control = (ControlHandle) m_macControl ;
-        if ( control && ::IsControlActive( control ) )
+        if ( changing.IsAllowed() )

         {
         {

-            {
-                wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
-                    ::GetControl32BitValue(control) - 1, m_nSelection);
-                changing.SetEventObject(this);
-                GetEventHandler()->ProcessEvent(changing);
-
-                if(changing.IsAllowed())
-                {
-                    controlpart = ::HandleControlClick(control, localwhere, modifiers,
-                        (ControlActionUPP) -1);
-                    wxTheApp->s_lastMouseDown = 0 ;
-
-                    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
-                        ::GetControl32BitValue(control) - 1, m_nSelection);
-                    event.SetEventObject(this);
-
-                    GetEventHandler()->ProcessEvent(event);
-                }
-            }
+            wxNotebookEvent event(
+                wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
+                newSel, m_nSelection );
+            event.SetEventObject( this );
+            GetEventHandler()->ProcessEvent( event );
+        }
+        else
+        {
+            m_peer->SetValue( m_nSelection + 1 ) ;

         }
         }

-    }
-}
-

 
 

-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);
-    event.SetEventObject(this);
+        status = noErr ;
+    }

 
 

-    ProcessEvent(event);
-#endif
+    return (wxInt32)status ;

 }
 
 }
 

+#endif