added some missing mac headers

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index ca975252fe12ef15fd79b5b940ed4aba5542f0e2..db806ca7e6fccff3bf4dce97ddf449a9243b8250 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -1,14 +1,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        notebook.cpp
 // Purpose:     implementation of wxNotebook
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        notebook.cpp
 // 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
 ///////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+#pragma implementation "notebook.h"
+#endif
+

 // ============================================================================
 // declarations
 // ============================================================================
 // ============================================================================
 // declarations
 // ============================================================================


@@ -16,32 +20,25 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#ifdef __GNUG__
-#pragma implementation "notebook.h"
-#endif
-
-#include  <wx/string.h>
-#include  <wx/log.h>
-#include  <wx/imaglist.h>
-#include  <wx/notebook.h>
-#include <wx/mac/uma.h>
+#include "wx/app.h"
+#include "wx/string.h"
+#include "wx/log.h"
+#include "wx/imaglist.h"
+#include "wx/image.h"
+#include "wx/notebook.h"
+#include "wx/mac/uma.h"

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

-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())

 
 

-const short kwxMacTabLeftMargin = 16 ;
-const short kwxMacTabTopMargin = 30 ;
-const short kwxMacTabRightMargin = 16 ;
-const short kwxMacTabBottomMargin = 16 ;

 
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // 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)
 


@@ -55,7 +52,6 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -68,7 +64,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 // common part of all ctors
 void wxNotebook::Init()
 {
 // common part of all ctors
 void wxNotebook::Init()
 {

-    m_pImageList = NULL;

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


@@ -99,192 +94,335 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         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 , true , 0 , 0 , 1, 
-               kControlTabSmallProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-       return TRUE ;
+    m_macIsUserPane = FALSE ;
+    
+    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(wxNB_LEFT) )
+        tabstyle = kControlTabDirectionWest ;
+    else if ( HasFlag( wxNB_RIGHT ) )
+        tabstyle = kControlTabDirectionEast ;
+    else if ( HasFlag( wxNB_BOTTOM ) )
+        tabstyle = kControlTabDirectionSouth ;
+        
+    ControlTabSize tabsize = kControlTabSizeLarge ;
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+        tabsize = kControlTabSizeSmall ;
+    else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+    {
+        if (UMAGetSystemVersion() >= 0x1030 )
+            tabsize = 3 ; 
+        else
+            tabsize = kControlSizeSmall; 
+    }
+
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+     tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
+    
+    
+    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& padding)

 {
 {

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

 }
 
 }
 

-int wxNotebook::GetRowCount() const
+void wxNotebook::SetTabSize(const wxSize& 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 ) ;
-//     Boolean enabled = true ;
-       
-//     SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );
-    return m_nSelection;
+    SetSize( CalcSizeFromPage( size ) );

 }
 
 }
 

-void wxNotebook::AdvanceSelection(bool bForward)
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const

 {
 {

-    int nSel = GetSelection();
-    int nMax = GetPageCount() - 1;
-    if ( bForward )
-        SetSelection(nSel == nMax ? 0 : nSel + 1);
-    else
-        SetSelection(nSel == 0 ? nMax : nSel - 1);
+    return DoGetSizeFromClientSize( sizePage ) ;

 }
 
 }
 

-bool wxNotebook::SetPageText(int nPage, const wxString& strText)
+wxSize wxNotebook::DoGetBestSize() const

 {
 {

-    wxASSERT( IS_VALID_PAGE(nPage) );
+    // calculate the max page size
+    wxSize size(0, 0);
+
+    size_t count = GetPageCount();
+    if ( count )
+    {
+        for ( size_t n = 0; n < count; n++ )
+        {
+            wxSize sizePage = m_pages[n]->GetSize();
+
+            if ( size.x < sizePage.x )
+                size.x = sizePage.x;
+            if ( size.y < sizePage.y )
+                size.y = sizePage.y;
+        }
+    }
+    else // no pages
+    {
+        // use some arbitrary default size
+        size.x =
+        size.y = 100;
+    }

 
 

-    // TODO
-    return FALSE;
+    return CalcSizeFromPage(size);

 }
 
 }
 

-wxString wxNotebook::GetPageText(int nPage) const
+int wxNotebook::SetSelection(size_t nPage)

 {
 {

-    wxASSERT( IS_VALID_PAGE(nPage) );
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
+
+    if ( int(nPage) != 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() )
+        {
+            // program allows the page change
+            event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+            (void)GetEventHandler()->ProcessEvent(event);
+
+            ChangePage(m_nSelection, nPage);
+        }
+    }

 
 

-    // TODO
-    return wxString("");
+    return m_nSelection;

 }
 
 }
 

-int wxNotebook::GetPageImage(int nPage) const
+bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)

 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 

-    // TODO
-    return 0;
+    wxNotebookPage *page = m_pages[nPage];
+    page->SetLabel(strText);
+    MacSetupTabs();
+
+    return true;

 }
 
 }
 

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

 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
 

-    // TODO
-    return FALSE;
+    wxNotebookPage *page = m_pages[nPage];
+    return page->GetLabel();

 }
 
 }
 

-void wxNotebook::SetImageList(wxImageList* imageList)
-{ 
-    m_pImageList = imageList;
-    // TODO
-}
+int wxNotebook::GetPageImage(size_t nPage) const
+{
+    wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );

 
 

-// ----------------------------------------------------------------------------
-// wxNotebook operations
-// ----------------------------------------------------------------------------
+    return m_images[nPage];
+}

 
 

-// remove one page from the notebook
-bool wxNotebook::DeletePage(int nPage)
+bool wxNotebook::SetPageImage(size_t nPage, int nImage)

 {
 {

-    wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+    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()") );

 
 

-    // TODO: delete native widget page
+    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;

 
 

-    delete m_aPages[nPage];
-    m_aPages.Remove(nPage);
+        MacSetupTabs() ;
+    }

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

+// ----------------------------------------------------------------------------
+// wxNotebook operations
+// ----------------------------------------------------------------------------
+

 // remove one page from the notebook, without deleting the window
 // remove one page from the notebook, without deleting the window

-bool wxNotebook::RemovePage(int nPage)
+wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage)

 {
 {

-    wxCHECK( IS_VALID_PAGE(nPage), FALSE );
+    wxCHECK( IS_VALID_PAGE(nPage), NULL );
+    wxNotebookPage* page = m_pages[nPage] ;
+    m_pages.RemoveAt(nPage);

 
 

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

 
 

-    return TRUE;
+    if(m_nSelection >= (int)GetPageCount()) {
+        m_nSelection = GetPageCount() - 1;
+    }
+    if(m_nSelection >= 0) {
+        m_pages[m_nSelection]->Show(true);
+    }
+    InvalidateBestSize();
+    return page;

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

-    // TODO: delete native widget pages
-
-    int nPageCount = GetPageCount();
-    int nPage;
-    for ( nPage = 0; nPage < nPageCount; nPage++ )
-        delete m_aPages[nPage];
-
-    m_aPages.Clear();
-
+    WX_CLEAR_ARRAY(m_pages) ;
+    MacSetupTabs();
+    m_nSelection = -1 ;
+    InvalidateBestSize();

     return TRUE;
 }
 
     return TRUE;
 }
 

-// 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);
-}

 
 // same as AddPage() but does it at given position
 
 // same as AddPage() but does it at given position

-bool wxNotebook::InsertPage(int nPage,
+bool wxNotebook::InsertPage(size_t nPage,

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

-    wxASSERT( pPage != NULL );
-    wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
-
-               ControlTabInfoRec tie ;
-               Boolean enabled = true ;
-               if ( nPage + 1 > GetControlMaximum( m_macControl ) )
-               {
-                       SetControlMaximum( m_macControl , nPage + 1 ) ;
-               }
-               
-               tie.version = 0 ;
-               tie.iconSuiteID = 0 ;
-#if TARGET_CARBON
-               c2pstrcpy( (StringPtr) tie.name , strText ) ;
-#else
-               strcpy( (char *) tie.name , strText ) ;
-               c2pstr( (char *) tie.name ) ;
-#endif
-               SetControlData( m_macControl, nPage + 1, kControlTabInfoTag , sizeof( ControlTabInfoRec) , (char*) &tie ) ;
-               SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled );
+    if ( !wxNotebookBase::InsertPage(nPage, pPage, strText, bSelect, imageId) )
+        return false;
+
+    wxASSERT_MSG( pPage->GetParent() == this,
+                    _T("notebook pages must have notebook as parent") );

 
 

-    // save the pointer to the page
-    m_aPages.Insert(pPage, nPage);
+    // don't show pages by default (we'll need to adjust their size first)
+    pPage->Show( false ) ;
+
+    pPage->SetLabel(strText);
+
+    m_images.Insert(imageId, nPage);
+
+    MacSetupTabs();
+
+    wxRect rect = GetPageRect() ;
+    pPage->SetSize(rect);
+    if ( pPage->GetAutoLayout() ) {
+        pPage->Layout();
+    }

 
 

-    // some page must be selected: either this one or the first one if there is 
-    // still no selection
+
+    // 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 )
     if ( bSelect )

-        m_nSelection = nPage;
+        selNew = nPage;

     else if ( m_nSelection == -1 )
     else if ( m_nSelection == -1 )

-        m_nSelection = 0;
+        selNew = 0;

 
 

-       // don't show pages by default (we'll need to adjust their size first)
-               pPage->Show( FALSE ) ;
+    if ( selNew != -1 )
+        SetSelection(selNew);

 
 

-    return TRUE;
+    InvalidateBestSize();
+    return true;

 }
 
 }
 

+/* 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()
+{
+    m_peer->SetMaximum( GetPageCount() ) ;
+
+    wxNotebookPage *page;
+    ControlTabInfoRec info;
+
+    const size_t countPages = GetPageCount();
+    for(size_t ii = 0; ii < countPages; ii++)
+    {
+        page = m_pages[ii];
+        info.version = 0;
+        info.iconSuiteID = 0;
+        wxMacStringToPascal( page->GetLabel() , info.name ) ;
+        m_peer->SetData<ControlTabInfoRec>( ii+1, kControlTabInfoTag, &info ) ;
+        m_peer->SetTabEnabled( ii + 1 , true ) ;
+#if TARGET_CARBON
+        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 )
+            {
+                wxBitmap scaledBitmap ;
+                if ( bmap->GetWidth() != 16 || bmap->GetHeight() != 16 )
+                {
+                    scaledBitmap = wxBitmap( bmap->ConvertToImage().Scale(16,16) ) ;
+                    bmap = &scaledBitmap ;
+                }
+                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 ;
+                m_peer->SetData<ControlButtonContentInfo>( ii+1,kControlTabImageContentTag, &info );
+                wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
+                if ( UMAGetSystemVersion() < 0x1030 )
+                {                      
+                       UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
+                }
+       
+                ReleaseIconRef( iconRef ) ;
+                DisposeHandle( (Handle) iconFamily ) ;
+            }
+        }
+#endif
+    }
+    Rect bounds;
+    m_peer->GetRectInWindowCoords( &bounds ) ;
+    InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds);
+}
+
+wxRect wxNotebook::GetPageRect() const
+{
+    wxSize size = GetClientSize() ;
+    return wxRect( 0 , 0 , size.x , size.y ) ;
+}

 // ----------------------------------------------------------------------------
 // wxNotebook callbacks
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxNotebook callbacks
 // ----------------------------------------------------------------------------


@@ -293,32 +431,15 @@ bool wxNotebook::InsertPage(int nPage,
 //     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;
-    }

 
 

-    // 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();
+    unsigned int nCount = m_pages.Count();
+    wxRect rect = GetPageRect() ;

     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {

-        wxNotebookPage *pPage = m_aPages[nPage];
-        pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin, w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
-               h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
-//        pPage->SetSize(0, 0, w, h);
-        if ( pPage->GetAutoLayout() )
+        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


@@ -339,7 +460,7 @@ 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();
 }
 
     event.Skip();
 }


@@ -351,10 +472,50 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         AdvanceSelection(event.GetDirection());
     }
     else {
         AdvanceSelection(event.GetDirection());
     }
     else {

-        // pass to the parent
-        if ( GetParent() ) {
-            event.SetCurrentFocus(this);
-            GetParent()->ProcessEvent(event);
+        // 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 fic 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->GetEventHandler()->ProcessEvent(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->GetEventHandler()->ProcessEvent(event);
+            }

         }
     }
 }
         }
     }
 }


@@ -363,22 +524,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
-    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 /* nPhase */)
+bool wxNotebook::DoPhase(int WXUNUSED(nPhase))

 {
 {

-    return TRUE;
+  return TRUE;

 }
 
 }
 

+#endif // wxUSE_CONSTRAINTS
+

 void wxNotebook::Command(wxCommandEvent& event)
 {
 void wxNotebook::Command(wxCommandEvent& event)
 {

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

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


@@ -388,33 +553,48 @@ 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();
-    return;
-  }
-
-    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);
-
-  ProcessEvent(event);
+    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);
+        GetEventHandler()->ProcessEvent(changing);
+
+        if(changing.IsAllowed())
+        {
+            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 ) ;
+        }
+        status = noErr ;
+    }
+    return status ;

 }
 
 }