applied SF patch # 826838 to fix removal of -psn_* command line argument

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 56cacb02a2392596999174936c07daf09238d85b..7de1af74e19ff94565bb00f9d9e62186556c385a 100644 (file)
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -2,7 +2,7 @@
 // Name:        notebook.cpp
 // Purpose:     implementation of wxNotebook
 // Author:      Stefan Csomor
 // Name:        notebook.cpp
 // Purpose:     implementation of wxNotebook
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor


@@ -24,6 +24,7 @@
 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/imaglist.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"
 // ----------------------------------------------------------------------------
 #include "wx/notebook.h"
 #include "wx/mac/uma.h"
 // ----------------------------------------------------------------------------


@@ -31,72 +32,120 @@
 // ----------------------------------------------------------------------------
 
 // check that the page index is valid
 // ----------------------------------------------------------------------------
 
 // check that the page index is valid

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

 
 

-static bool constantsSet = false ;
-
-short kwxMacTabLeftMargin = 0 ;
-short kwxMacTabTopMargin = 0 ;
-short kwxMacTabRightMargin = 0 ;
-short kwxMacTabBottomMargin = 0 ;

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

-#if !USE_SHARED_LIBRARIES

 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(-1, wxNotebook::OnSelChange)
+    EVT_MOUSE_EVENTS(wxNotebook::OnMouse)

 
 

-EVT_SIZE(wxNotebook::OnSize)
-EVT_SET_FOCUS(wxNotebook::OnSetFocus)
-EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
+    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(wxNotebookEvent, wxCommandEvent)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

-#endif

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

-// ----------------------------------------------------------------------------
-// wxNotebook construction
-// ----------------------------------------------------------------------------
+// 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

 
 

-// common part of all ctors
-void wxNotebook::Init()
+// 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)

 {
 {

-    if ( !constantsSet )
+    static int tabMargin = -1;
+    static int otherMargin = -1;
+
+    if ( tabMargin == -1)

     {
         if ( UMAHasAquaLayout() )
         {
     {
         if ( UMAHasAquaLayout() )
         {

-            // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
-            kwxMacTabLeftMargin = 20 ;
-            kwxMacTabTopMargin = 38 ;
-            kwxMacTabRightMargin = 20 ;
-            kwxMacTabBottomMargin = 12 ;
+            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
         {
         }
         else
         {

-            kwxMacTabLeftMargin = 16 ;
-            kwxMacTabTopMargin = 30 ;
-            kwxMacTabRightMargin = 16 ;
-            kwxMacTabBottomMargin = 16 ;
+            return tabMargin;

         }
         }

-        constantsSet = true ;

     }
     }

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

     if ( UMAHasAquaLayout() )
     {
     if ( UMAHasAquaLayout() )
     {

+        // Should these depend on wxMAC_EDGE_TO_EDGE too?

         m_macHorizontalBorder = 7;
         m_macVerticalBorder = 8;
     }
         m_macHorizontalBorder = 7;
         m_macVerticalBorder = 8;
     }

-    
+

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


@@ -115,7 +164,7 @@ wxNotebook::wxNotebook(wxWindow *parent,
                        const wxString& name)
 {
     Init();
                        const wxString& name)
 {
     Init();

-    
+

     Create(parent, id, pos, size, style, name);
 }
 
     Create(parent, id, pos, size, style, name);
 }
 


@@ -127,11 +176,14 @@ bool wxNotebook::Create(wxWindow *parent,
                         long style,
                         const wxString& name)
 {
                         long style,
                         const wxString& name)
 {

+    if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) )
+        return false;
+

     Rect bounds ;
     Str255 title ;
     Rect bounds ;
     Str255 title ;

-    
-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
-    
+
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+

     int tabstyle = kControlTabSmallNorthProc ;
     if ( HasFlag(wxNB_LEFT) )
         tabstyle = kControlTabSmallWestProc ;
     int tabstyle = kControlTabSmallNorthProc ;
     if ( HasFlag(wxNB_LEFT) )
         tabstyle = kControlTabSmallWestProc ;


@@ -139,11 +191,11 @@ bool wxNotebook::Create(wxWindow *parent,
         tabstyle = kControlTabSmallEastProc ;
     else if ( HasFlag( wxNB_BOTTOM ) )
         tabstyle = kControlTabSmallSouthProc ;
         tabstyle = kControlTabSmallEastProc ;
     else if ( HasFlag( wxNB_BOTTOM ) )
         tabstyle = kControlTabSmallSouthProc ;

-    
-    
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+
+
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1,

         tabstyle , (long) this ) ;
         tabstyle , (long) this ) ;

-    
+

     MacPostControlCreate() ;
     return TRUE ;
 }
     MacPostControlCreate() ;
     return TRUE ;
 }


@@ -151,22 +203,21 @@ bool wxNotebook::Create(wxWindow *parent,
 // dtor
 wxNotebook::~wxNotebook()
 {
 // dtor
 wxNotebook::~wxNotebook()
 {

-    m_macControl = NULL ;

 }
 
 }
 

-wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
+wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const

 {
     wxSize sizeTotal = sizePage;
 {
     wxSize sizeTotal = sizePage;

-    
+

     int major,minor;
     wxGetOsVersion( &major, &minor );
     int major,minor;
     wxGetOsVersion( &major, &minor );

-    
+

     // Mac has large notebook borders. Aqua even more so.
     // Mac has large notebook borders. Aqua even more so.

-    
+

     if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
     {
         sizeTotal.x += 90;
     if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
     {
         sizeTotal.x += 90;

-        
+

         if (major >= 10)
             sizeTotal.y += 28;
         else
         if (major >= 10)
             sizeTotal.y += 28;
         else


@@ -185,7 +236,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
             sizeTotal.y += 44;
         }
     }
             sizeTotal.y += 44;
         }
     }

-    
+

     return sizeTotal;
 }
 
     return sizeTotal;
 }
 


@@ -208,61 +259,72 @@ void wxNotebook::SetPageSize(const wxSize& size)
     wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
 }
 
     wxFAIL_MSG( wxT("wxNotebook::SetPageSize not implemented") );
 }
 

-int wxNotebook::SetSelection(int nPage)
+int wxNotebook::SetSelection(size_t nPage)

 {
 {

-    if( !IS_VALID_PAGE(nPage) ) 
-        return m_nSelection ;
-    
-    ChangePage(m_nSelection, nPage);
-    SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
-    
-    Refresh();
+    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);
+        }
+    }
+

     return m_nSelection;
 }
 
     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) );
 {
     wxASSERT( IS_VALID_PAGE(nPage) );

-    
+

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

-    
+

     return true;
 }
 
     return true;
 }
 

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

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

-    
+

     wxNotebookPage *page = m_pages[nPage];
     return page->GetLabel();
 }
 
     wxNotebookPage *page = m_pages[nPage];
     return page->GetLabel();
 }
 

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

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );

-    
+

     return m_images[nPage];
 }
 
     return m_images[nPage];
 }
 

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

 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
 {
     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( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,
         _T("invalid image index in SetPageImage()") );

-    
+

     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;
     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() ;
     }
         MacSetupTabs() ;
     }

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -271,15 +333,15 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
 // ----------------------------------------------------------------------------
 
 // remove one page from the notebook, without deleting the window
 // ----------------------------------------------------------------------------
 
 // remove one page from the notebook, without deleting the window

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

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

-    
+

     MacSetupTabs();
     MacSetupTabs();

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

         m_nSelection = GetPageCount() - 1;
     }
     if(m_nSelection >= 0) {
         m_nSelection = GetPageCount() - 1;
     }
     if(m_nSelection >= 0) {


@@ -291,55 +353,70 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-    // TODO: delete native widget pages
-    

     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();
     WX_CLEAR_ARRAY(m_pages) ;
     MacSetupTabs();

-    
+    m_nSelection = -1 ;

     return TRUE;
 }
 
 
 // same as AddPage() but does it at given position
     return TRUE;
 }
 
 
 // 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 );
-    
+    if ( !wxNotebookBase::InsertPage(nPage, pPage, strText, bSelect, imageId) )
+        return false;
+
+    wxASSERT_MSG( pPage->GetParent() == this,
+                    _T("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(strText);
     pPage->SetLabel(strText);

-    
-    // save the pointer to the page
-    m_pages.Insert(pPage, nPage);
-    
+

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

-    
+

     MacSetupTabs();
     MacSetupTabs();

-    
-    if ( bSelect ) {
-        m_nSelection = nPage;
-    }
-    else if ( m_nSelection == -1 ) {
-        m_nSelection = 0;
-    }
-    else if (m_nSelection >= nPage) {
-        m_nSelection++;
-    }
-    // don't show pages by default (we'll need to adjust their size first)
-    pPage->Show( false ) ;
-    
+

     int h, w;
     GetSize(&w, &h);
     int h, w;
     GetSize(&w, &h);

-    pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
-        w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
-        h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
+    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->Layout();
     }
     if ( pPage->GetAutoLayout() ) {
         pPage->Layout();
     }

+
+
+    // 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
+        SetControl32BitValue( (ControlHandle) m_macControl , 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);
+

     return true;
 }
 
     return true;
 }
 


@@ -351,49 +428,56 @@ bool wxNotebook::InsertPage(int nPage,
 void wxNotebook::MacSetupTabs()
 {
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;
 void wxNotebook::MacSetupTabs()
 {
     SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;

-    
+

     wxNotebookPage *page;
     ControlTabInfoRec info;
     wxNotebookPage *page;
     ControlTabInfoRec info;

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

     {
         page = m_pages[ii];
         info.version = 0;
         info.iconSuiteID = 0;
     {
         page = m_pages[ii];
         info.version = 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
+        wxMacStringToPascal( page->GetLabel() , info.name ) ;
+

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

-#if 0 // TARGET_CARBON
+#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
         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 
+            // 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
             // unregister it) in case this will ever lead to having the same icon everywhere add some kind

-            // of static counter 
-            ControlButtonContentInfo info ;
-            wxMacCreateBitmapButton( &info , *GetImageList()->GetBitmap( GetPageImage(ii ) ) , kControlContentPictHandle) ;
-            IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(0) ;
-            OSErr err = SetIconFamilyData( iconFamily, 'PICT' , (Handle) info.u.picture ) ;
-            wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ;
-            IconRef iconRef ;
-            err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) 1 , iconFamily, &iconRef ) ;
-            wxASSERT_MSG( err == noErr , "Error when adding bitmap" ) ;
-            info.contentType = kControlContentIconRef ;
-            info.u.iconRef = iconRef ;
-            SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag,
-                sizeof( info ), (Ptr)&info );
-            wxASSERT_MSG( err == noErr , "Error when setting icon on tab" ) ;
-               UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
-            ReleaseIconRef( iconRef ) ;
-            DisposeHandle( (Handle) iconFamily ) ;
+            // 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 ;
+                SetControlData( (ControlHandle) m_macControl, ii+1,kControlTabImageContentTag,
+                    sizeof( info ), (Ptr)&info );
+                wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
+                   UnregisterIconRef( 'WXNG' , (OSType) 1 ) ;
+                ReleaseIconRef( iconRef ) ;
+                DisposeHandle( (Handle) iconFamily ) ;
+            }

         }
 #endif
     }
         }
 #endif
     }


@@ -412,25 +496,28 @@ void wxNotebook::OnSize(wxSizeEvent& event)
 {
     // emulate page change (it's esp. important to do it first time because
     // otherwise our page would stay invisible)
 {
     // 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);
     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);
     // fit the notebook page to the tab control's display area
     int w, h;
     GetSize(&w, &h);

-    
+

     unsigned int nCount = m_pages.Count();
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_pages[nPage];
     unsigned int nCount = m_pages.Count();
     for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) {
         wxNotebookPage *pPage = m_pages[nPage];

-        pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
-            w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
-            h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
+        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->Layout();
         }
     }
         if ( pPage->GetAutoLayout() ) {
             pPage->Layout();
         }
     }

-    
+

     // Processing continues to next OnSize
     event.Skip();
 }
     // Processing continues to next OnSize
     event.Skip();
 }


@@ -440,7 +527,7 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
     // is it our tab control?
     if ( event.GetEventObject() == this )
         ChangePage(event.GetOldSelection(), event.GetSelection());
     // is it our tab control?
     if ( event.GetEventObject() == this )
         ChangePage(event.GetOldSelection(), event.GetSelection());

-    
+

     // we want to give others a chance to process this message as well
     event.Skip();
 }
     // we want to give others a chance to process this message as well
     event.Skip();
 }


@@ -450,7 +537,7 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event)
     // set focus to the currently selected page if any
     if ( m_nSelection != -1 )
         m_pages[m_nSelection]->SetFocus();
     // set focus to the currently selected page if any
     if ( m_nSelection != -1 )
         m_pages[m_nSelection]->SetFocus();

-    
+

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -461,10 +548,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);
+            }

         }
     }
 }
         }
     }
 }


@@ -473,22 +600,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"));

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


@@ -498,27 +629,20 @@ 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 )
+    if ( nOldSel != -1 ) 
+    {
+        m_pages[nOldSel]->Show(FALSE);
+    }
+
+    if ( nSel != -1 )

     {
         wxNotebookPage *pPage = m_pages[nSel];
     {
         wxNotebookPage *pPage = m_pages[nSel];

-        pPage->Show(FALSE);

         pPage->Show(TRUE);
         pPage->SetFocus();
         pPage->Show(TRUE);
         pPage->SetFocus();

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

     }
     
     }
     

-    wxNotebookPage *pPage = m_pages[nSel];
-    pPage->Show(TRUE);
-    pPage->SetFocus();
-    

     m_nSelection = nSel;
     m_nSelection = nSel;

+    SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;

 }
 
 
 }
 
 


@@ -529,38 +653,38 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
         event.Skip() ;
         return ;
     }
         event.Skip() ;
         return ;
     }

-    
+

     if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
     {
         int x = event.m_x ;
         int y = event.m_y ;
     if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
     {
         int x = event.m_x ;
         int y = event.m_y ;

-        
+

         MacClientToRootWindow( &x , &y ) ;
         MacClientToRootWindow( &x , &y ) ;

-        
+

         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;
         ControlHandle   control ;
         Point       localwhere ;
         SInt16      controlpart ;

-        
+

         localwhere.h = x ;
         localwhere.v = y ;
         localwhere.h = x ;
         localwhere.v = y ;

-        
+

         short modifiers = 0;
         short modifiers = 0;

-        
+

         if ( !event.m_leftDown && !event.m_rightDown )
             modifiers  |= btnState ;
         if ( !event.m_leftDown && !event.m_rightDown )
             modifiers  |= btnState ;

-        
+

         if ( event.m_shiftDown )
             modifiers |= shiftKey ;
         if ( event.m_shiftDown )
             modifiers |= shiftKey ;

-        
+

         if ( event.m_controlDown )
             modifiers |= controlKey ;
         if ( event.m_controlDown )
             modifiers |= controlKey ;

-        
+

         if ( event.m_altDown )
             modifiers |= optionKey ;
         if ( event.m_altDown )
             modifiers |= optionKey ;

-        
+

         if ( event.m_metaDown )
             modifiers |= cmdKey ;
         if ( event.m_metaDown )
             modifiers |= cmdKey ;

-        
+

         control = (ControlHandle) m_macControl ;
         if ( control && ::IsControlActive( control ) )
         {
         control = (ControlHandle) m_macControl ;
         if ( control && ::IsControlActive( control ) )
         {


@@ -568,19 +692,19 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
                 wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
                     ::GetControl32BitValue(control) - 1, m_nSelection);
                 changing.SetEventObject(this);
                 wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
                     ::GetControl32BitValue(control) - 1, m_nSelection);
                 changing.SetEventObject(this);

-                ProcessEvent(changing);
-                
+                GetEventHandler()->ProcessEvent(changing);
+

                 if(changing.IsAllowed())
                 {
                     controlpart = ::HandleControlClick(control, localwhere, modifiers,
                         (ControlActionUPP) -1);
                     wxTheApp->s_lastMouseDown = 0 ;
                 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);
                     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
                         ::GetControl32BitValue(control) - 1, m_nSelection);
                     event.SetEventObject(this);

-                    
-                    ProcessEvent(event);
+
+                    GetEventHandler()->ProcessEvent(event);

                 }
             }
         }
                 }
             }
         }


@@ -588,12 +712,12 @@ void  wxNotebook::OnMouse( wxMouseEvent &event )
 }
 
 
 }
 
 

-void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+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);
 {
 #if 0
     wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection);
     event.SetEventObject(this);

-    
+

     ProcessEvent(event);
 #endif
 }
     ProcessEvent(event);
 #endif
 }