pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 686a969462e84bd2d4357dba6ccd3e04cedafeed..7f82d490f77565a17199abbec5d3629bef83afea 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -1,86 +1,54 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implementation of wxNotebook
 // Purpose:     implementation of wxNotebook

-// Author:      AUTHOR
-// Modified by: 
-// Created:     ??/??/98
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
+#include "wx/wxprec.h"

 
 

-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#ifdef __GNUG__
-#pragma implementation "notebook.h"
+#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
 
 #endif
 

-#include  <wx/string.h>
-#include  <wx/log.h>
-#include  <wx/imaglist.h>
-#include  <wx/notebook.h>
-#include <wx/mac/uma.h>
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
+#include "wx/string.h"
+#include "wx/imaglist.h"
+#include "wx/mac/uma.h"
+

 
 // check that the page index is valid
 
 // check that the page index is valid

-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
-
-#ifdef __WXMAC_X__
-  // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
-const short kwxMacTabLeftMargin = 20 ;
-const short kwxMacTabTopMargin = 38 ;
-const short kwxMacTabRightMargin = 20 ;
-const short kwxMacTabBottomMargin = 12 ;
-#else
-const short kwxMacTabLeftMargin = 16 ;
-const short kwxMacTabTopMargin = 30 ;
-const short kwxMacTabRightMargin = 16 ;
-const short kwxMacTabBottomMargin = 16 ;
-#endif
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())

 
 

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

 
 

-#if !USE_SHARED_LIBRARIES

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
 
 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)
+BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)

 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
 
     EVT_SIZE(wxNotebook::OnSize)
     EVT_SET_FOCUS(wxNotebook::OnSetFocus)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)

 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

-#endif

 
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// wxNotebook construction
-// ----------------------------------------------------------------------------

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

-#ifdef __WXMAC_X__
-    m_macHorizontalBorder = 7;
-    m_macVerticalBorder = 8;
-#endif
-    m_pImageList = NULL;

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


@@ -91,253 +59,377 @@ 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 )

 {
 {

-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
-
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
-               kControlTabSmallProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-       return TRUE ;
+    m_macIsUserPane = false ;
+
+    if (! (style & wxBK_ALIGN_MASK))
+        style |= wxBK_TOP;
+
+    if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) )
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+
+    if ( bounds.right <= bounds.left )
+        bounds.right = bounds.left + 100;
+    if ( bounds.bottom <= bounds.top )
+        bounds.bottom = bounds.top + 100;
+
+    UInt16 tabstyle = kControlTabDirectionNorth;
+    if ( HasFlag(wxBK_LEFT) )
+        tabstyle = kControlTabDirectionWest;
+    else if ( HasFlag( wxBK_RIGHT ) )
+        tabstyle = kControlTabDirectionEast;
+    else if ( HasFlag( wxBK_BOTTOM ) )
+        tabstyle = kControlTabDirectionSouth;
+
+    ControlTabSize tabsize;
+    switch (GetWindowVariant())
+    {
+        case wxWINDOW_VARIANT_MINI:
+            tabsize = 3 ;
+            break;
+
+        case wxWINDOW_VARIANT_SMALL:
+            tabsize = kControlTabSizeSmall;
+            break;
+
+        default:
+            tabsize = kControlTabSizeLarge;
+            break;
+    }
+
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateTabsControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+        tabsize, tabstyle, 0, NULL, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    MacPostControlCreate( pos, size );
+
+    return true ;

 }
 
 // dtor
 wxNotebook::~wxNotebook()
 {
 }
 
 // dtor
 wxNotebook::~wxNotebook()
 {

-       m_macControl = NULL ;

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------

-int wxNotebook::GetPageCount() const
+
+void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding))

 {
 {

-    return m_aPages.Count();
+    // unsupported by OS

 }
 
 }
 

-int wxNotebook::GetRowCount() const
+void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz))

 {
 {

-    return 1;
+    // unsupported by OS

 }
 
 }
 

-int wxNotebook::SetSelection(int nPage)
+void wxNotebook::SetPageSize(const wxSize& size)

 {
 {

-    wxASSERT( IS_VALID_PAGE(nPage) );
-
-    ChangePage(m_nSelection, nPage);
-       SetControlValue( m_macControl , m_nSelection + 1 ) ;
+    SetSize( CalcSizeFromPage( size ) );
+}

 
 

-    return m_nSelection;
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
+{
+    return DoGetSizeFromClientSize( sizePage );

 }
 
 }
 

-void wxNotebook::AdvanceSelection(bool bForward)
+int wxNotebook::DoSetSelection(size_t nPage, int flags)

 {
 {

-    if (GetPageCount() == 0) {
-        return;
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") );
+
+    if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection )
+    {
+        if ( flags & SetSelection_SendEvent )
+        {
+            if ( !SendPageChangingEvent(nPage) )
+            {
+                // vetoed by program
+                return m_nSelection;
+            }
+            //else: program allows the page change
+
+            SendPageChangedEvent(m_nSelection, nPage);
+        }
+
+        ChangePage(m_nSelection, nPage);

     }
     }

-    int nSel = GetSelection();
-    int nMax = GetPageCount() - 1;
-    if ( bForward )
-        SetSelection(nSel == nMax ? 0 : nSel + 1);
-    else
-        SetSelection(nSel == 0 ? nMax : nSel - 1);
+    //else: no change
+
+    return m_nSelection;

 }
 
 }
 

-bool wxNotebook::SetPageText(int nPage, const wxString& strText)
+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_aPages[nPage];
-    page->SetLabel(strText);
+    wxNotebookPage *page = m_pages[nPage];
+    page->SetLabel(wxStripMenuCodes(strText));

     MacSetupTabs();
 
     return true;
 }
 
     MacSetupTabs();
 
     return true;
 }
 

-wxString wxNotebook::GetPageText(int 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_aPages[nPage];

     return page->GetLabel();
 }
 
     return page->GetLabel();
 }
 

-int wxNotebook::GetPageImage(int nPage) const
+int wxNotebook::GetPageImage(size_t nPage) const

 {
 {

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

 
 

-    // TODO
-    return 0;
+    return m_images[nPage];

 }
 
 }
 

-bool wxNotebook::SetPageImage(int nPage, int nImage)
+bool wxNotebook::SetPageImage(size_t nPage, int nImage)

 {
 {

-    wxASSERT( IS_VALID_PAGE(nPage) );
+    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") );

 
 

-    // TODO
-    return FALSE;
-}
+    if ( nImage != m_images[nPage] )
+    {
+        // if the item didn't have an icon before or, on the contrary, did have
+        // it but has lost it now, its size will change - but if the icon just
+        // changes, it won't
+        m_images[nPage] = nImage;
+
+        MacSetupTabs() ;
+    }

 
 

-void wxNotebook::SetImageList(wxImageList* imageList)
-{ 
-    m_pImageList = imageList;
-    // TODO
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook operations
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxNotebook operations
 // ----------------------------------------------------------------------------
 

-// remove one page from the notebook
-bool wxNotebook::DeletePage(int nPage)
+// remove one page from the notebook, without deleting the window
+wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)

 {
 {

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

 
 

-    delete m_aPages[nPage];
-    m_aPages.Remove(nPage);
+    wxNotebookPage* page = m_pages[nPage] ;
+    m_pages.RemoveAt(nPage);

 
     MacSetupTabs();
 
 
     MacSetupTabs();
 

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

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

-    }
-    if(m_nSelection >= 0) {
-        m_aPages[m_nSelection]->Show(true);
-    }
-
-    return true;
-}

 
 

-// remove one page from the notebook, without deleting the window
-bool wxNotebook::RemovePage(int nPage)
-{
-    wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+    if (m_nSelection >= 0)
+        m_pages[m_nSelection]->Show(true);

 
 

-    m_aPages.Remove(nPage);
+    InvalidateBestSize();

 
 

-    return TRUE;
+    return page;

 }
 
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 }
 
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-    // TODO: delete native widget pages
+    WX_CLEAR_ARRAY(m_pages) ;
+    MacSetupTabs();
+    m_nSelection = -1 ;
+    InvalidateBestSize();

 
 

-    int nPageCount = GetPageCount();
-    int nPage;
-    for ( nPage = 0; nPage < nPageCount; nPage++ )
-        delete m_aPages[nPage];
+    return true;
+}

 
 

-    m_aPages.Clear();
+// same as AddPage() but does it at given position
+bool wxNotebook::InsertPage(size_t nPage,
+    wxNotebookPage *pPage,
+    const wxString& strText,
+    bool bSelect,
+    int imageId )
+{
+    if ( !wxNotebookBase::InsertPage( nPage, pPage, strText, bSelect, imageId ) )
+        return false;
+
+    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 ) ;
+
+    pPage->SetLabel( wxStripMenuCodes(strText) );
+
+    m_images.Insert( imageId, nPage );

 
     MacSetupTabs();
 
 
     MacSetupTabs();
 

-    return TRUE;
-}
+    wxRect rect = GetPageRect() ;
+    pPage->SetSize( rect );
+    if ( pPage->GetAutoLayout() )
+        pPage->Layout();

 
 

-// add a page to the notebook
-bool wxNotebook::AddPage(wxNotebookPage *pPage,
-                         const wxString& strText,
-                         bool bSelect,
-                         int imageId)
-{
-    return InsertPage(GetPageCount(), pPage, strText, bSelect, imageId);
+    // now deal with the selection
+    // ---------------------------
+
+    // if the inserted page is before the selected one, we must update the
+    // index of the selected page
+
+    if ( int(nPage) <= m_nSelection )
+    {
+        m_nSelection++;
+
+        // while this still is the same page showing, we need to update the tabs
+        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;
+    if ( bSelect )
+        selNew = nPage;
+    else if ( m_nSelection == -1 )
+        selNew = 0;
+
+    if ( selNew != -1 )
+        SetSelection( selNew );
+
+    InvalidateBestSize();
+
+    return true;

 }
 
 }
 

-// same as AddPage() but does it at given position
-bool wxNotebook::InsertPage(int nPage,
-                            wxNotebookPage *pPage,
-                            const wxString& strText,
-                            bool bSelect,
-                            int imageId)
+int wxNotebook::HitTest(const wxPoint& pt, long * flags) const

 {
 {

-    wxASSERT( pPage != NULL );
-    wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
+    int resultV = wxNOT_FOUND;

 
 

-    pPage->SetLabel(strText);
+    const int countPages = GetPageCount();

 
 

-    // save the pointer to the page
-    m_aPages.Insert(pPage, nPage);
+    // 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() ;

 
 

-    MacSetupTabs();
+    HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ;
+    HIViewPartCode outPart = 0 ;
+    OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart );

 
 

-    if ( bSelect ) {
-        m_nSelection = nPage;
-    }
-    else if ( m_nSelection == -1 ) {
-        m_nSelection = 0;
-    }
-    else if (m_nSelection >= nPage) {
-        m_nSelection++;
+    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 ) ;

     }
     }

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

 
 

-    int h, w;
-    GetSize(&w, &h);
-    pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
-                   w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
-                   h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
-    if ( pPage->GetAutoLayout() ) {
-        pPage->Layout();
+    if ( outPart >= 1 && outPart <= countPages )
+        resultV = outPart - 1 ;
+
+    if (flags != NULL)
+    {
+        *flags = 0;
+
+        // we cannot differentiate better
+        if (resultV >= 0)
+            *flags |= wxBK_HITTEST_ONLABEL;
+        else
+            *flags |= wxBK_HITTEST_NOWHERE;

     }
 
     }
 

-    return true;
+    return resultV;

 }
 
 }
 

-/* 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.
- */
+// 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()
 {

-    SetControlMaximum( m_macControl , GetPageCount() ) ;
+    m_peer->SetMaximum( GetPageCount() ) ;

 
     wxNotebookPage *page;
 
     wxNotebookPage *page;

-    ControlTabInfoRec info;
-    Boolean enabled = true;
-    for(int ii = 0; ii < GetPageCount(); ii++)
+    ControlTabInfoRecV1 info;
+
+    const size_t countPages = GetPageCount();
+    for (size_t ii = 0; ii < countPages; ii++)

     {
     {

-        page = m_aPages[ii];
-        info.version = 0;
+        page = m_pages[ii];
+        info.version = kControlTabInfoVersionOne;

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

-#if TARGET_CARBON
-               c2pstrcpy( (StringPtr) info.name , page->GetLabel() ) ;
-#else
-               strcpy( (char *) info.name , page->GetLabel() ) ;
-               c2pstr( (char *) info.name ) ;
-#endif
-        SetControlData( m_macControl, ii+1, kControlTabInfoTag,
-                        sizeof( ControlTabInfoRec) , (char*) &info ) ;
-        SetControlData( m_macControl, ii+1, kControlTabEnabledFlagTag,
-                        sizeof( Boolean ), (Ptr)&enabled );
+        wxCFStringRef cflabel( page->GetLabel(), GetFont().GetEncoding() ) ;
+        info.name = cflabel ;
+        m_peer->SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
+
+        if ( GetImageList() && GetPageImage(ii) >= 0 )
+        {
+            const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ;
+            if ( bmap.Ok() )
+            {
+                ControlButtonContentInfo 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") ) ;
+
+                wxMacReleaseBitmapButton( &info ) ;
+            }
+        }
+
+        m_peer->SetTabEnabled( ii + 1, true ) ;

     }
     }

-    Rect bounds;
-    GetControlBounds(m_macControl, &bounds);
-    InvalWindowRect(GetMacRootWindow(), &bounds);
+
+    Refresh();
+}
+
+wxRect wxNotebook::GetPageRect() const
+{
+    wxSize size = GetClientSize() ;
+
+    return wxRect( 0 , 0 , size.x , size.y ) ;

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


@@ -348,33 +440,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)
 {

-    static bool s_bFirstTime = TRUE;
-    if ( s_bFirstTime ) {
-        // TODO: any first-time-size processing.
-        s_bFirstTime = FALSE;
-    }
+    unsigned int nCount = m_pages.Count();
+    wxRect rect = GetPageRect() ;

 
 

-    // TODO: all this may or may not be necessary for your platform
-
-    // 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_aPages.Count();
-    for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
-        wxNotebookPage *pPage = m_aPages[nPage];
-        pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
-                       w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
-                       h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
-        if ( pPage->GetAutoLayout() ) {
+    for ( unsigned int nPage = 0; nPage < nCount; nPage++ )
+    {
+        wxNotebookPage *pPage = m_pages[nPage];
+        pPage->SetSize(rect);
+        if ( pPage->GetAutoLayout() )

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

-        }

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


@@ -395,22 +469,66 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event)
 {
     // set focus to the currently selected page if any
     if ( m_nSelection != -1 )
 {
     // set focus to the currently selected page if any
     if ( m_nSelection != -1 )

-        m_aPages[m_nSelection]->SetFocus();
+        m_pages[m_nSelection]->SetFocus();

 
     event.Skip();
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
 
     event.Skip();
 }
 
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {

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

         // change pages
         // change pages

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

     }
     }

-    else {
-        // pass to the parent
-        if ( GetParent() ) {
-            event.SetCurrentFocus(this);
-            GetParent()->ProcessEvent(event);
+    else
+    {
+        // we get this event in 2 cases
+        //
+        // a) one of our pages might have generated it because the user TABbed
+        // out from it in which case we should propagate the event upwards and
+        // our parent will take care of setting the focus to prev/next sibling
+        //
+        // or
+        //
+        // b) the parent panel wants to give the focus to us so that we
+        // forward it to our selected page. We can't deal with this in
+        // OnSetFocus() because we don't know which direction the focus came
+        // 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 fix a GCC ICE
+        if ( ((wxWindow*)event.GetEventObject()) == parent )
+        {
+            // no, it doesn't come from child, case (b): forward to a page
+            if ( m_nSelection != -1 )
+            {
+                // so that the page knows that the event comes from it's parent
+                // and is being propagated downwards
+                event.SetEventObject( this );
+
+                wxWindow *page = m_pages[m_nSelection];
+                if ( !page->HandleWindowEvent( event ) )
+                {
+                    page->SetFocus();
+                }
+                //else: page manages focus inside it itself
+            }
+            else
+            {
+                // we have no pages - still have to give focus to _something_
+                SetFocus();
+            }
+        }
+        else
+        {
+            // it comes from our child, case (a), pass to the parent
+            if ( parent )
+            {
+                event.SetCurrentFocus( this );
+                parent->HandleWindowEvent( event );
+            }

         }
     }
 }
         }
     }
 }


@@ -419,22 +537,26 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 // wxNotebook base class virtuals
 // ----------------------------------------------------------------------------
 
 // wxNotebook base class virtuals
 // ----------------------------------------------------------------------------
 

+#if wxUSE_CONSTRAINTS
+

 // override these 2 functions to do nothing: everything is done in OnSize
 
 // override these 2 functions to do nothing: everything is done in OnSize
 

-void wxNotebook::SetConstraintSizes(bool /* recurse */)
+void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse))

 {
     // don't set the sizes of the pages - their correct size is not yet known
 {
     // don't set the sizes of the pages - their correct size is not yet known

-    wxControl::SetConstraintSizes(FALSE);
+    wxControl::SetConstraintSizes( false );

 }
 
 }
 

-bool wxNotebook::DoPhase(int /* nPhase */)
+bool wxNotebook::DoPhase(int WXUNUSED(nPhase))

 {
 {

-    return TRUE;
+    return true;

 }
 
 }
 

-void wxNotebook::Command(wxCommandEvent& event)
+#endif // wxUSE_CONSTRAINTS
+
+void wxNotebook::Command(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxFAIL_MSG("wxNotebook::Command not implemented");
+    wxFAIL_MSG(wxT("wxNotebook::Command not implemented"));

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


@@ -444,34 +566,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)
 {

-    // it's not an error (the message may be generated by the tab control itself)
-    // and it may happen - just do nothing
-    if ( nSel == nOldSel )
-    {
-        wxNotebookPage *pPage = m_aPages[nSel];
-        pPage->Show(FALSE);
-        pPage->Show(TRUE);
-        pPage->SetFocus();
+    if (nOldSel == nSel)

         return;
         return;

-    }

 
 

-    // Hide previous page
-    if ( nOldSel != -1 ) {
-        m_aPages[nOldSel]->Show(FALSE);
-    }
+    if ( nOldSel != -1 )
+        m_pages[nOldSel]->Show( false );

 
 

-    wxNotebookPage *pPage = m_aPages[nSel];
-    pPage->Show(TRUE);
-    pPage->SetFocus();
+    if ( nSel != -1 )
+    {
+        wxNotebookPage *pPage = m_pages[nSel];
+        pPage->Show( true );
+        pPage->SetFocus();
+    }

 
     m_nSelection = nSel;
 
     m_nSelection = nSel;

+    m_peer->SetValue( m_nSelection + 1 ) ;

 }
 
 }
 

-void wxNotebook::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )

 {
 {

-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue(m_macControl) - 1, m_nSelection);
-  event.SetEventObject(this);
+    OSStatus status = eventNotHandledErr ;
+
+    SInt32 newSel = m_peer->GetValue() - 1 ;
+    if ( newSel != m_nSelection )
+    {
+        wxNotebookEvent changing(
+            wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
+            newSel , m_nSelection );
+        changing.SetEventObject( this );
+        HandleWindowEvent( changing );
+
+        if ( changing.IsAllowed() )
+        {
+            wxNotebookEvent event(
+                wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
+                newSel, m_nSelection );
+            event.SetEventObject( this );
+            HandleWindowEvent( event );
+        }
+        else
+        {
+            m_peer->SetValue( m_nSelection + 1 ) ;
+        }
+
+        status = noErr ;
+    }

 
 

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

 }
 
 }
 

+#endif