regenerated the makefiles with the latest filelist.txt

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

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 81ca5ebce6e412ad788767a3380f2f9db38c715c..56cacb02a2392596999174936c07daf09238d85b 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
+// Author:      Stefan Csomor

 // Modified by: 
 // Modified by: 

-// Created:     ??/??/98
+// 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,10 +20,6 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

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

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


@@ -35,10 +35,10 @@
 
 static bool constantsSet = false ;
 
 
 static bool constantsSet = false ;
 

- short kwxMacTabLeftMargin = 0 ;
- short kwxMacTabTopMargin = 0 ;
- short kwxMacTabRightMargin = 0 ;
- short kwxMacTabBottomMargin = 0 ;
+short kwxMacTabLeftMargin = 0 ;
+short kwxMacTabTopMargin = 0 ;
+short kwxMacTabRightMargin = 0 ;
+short kwxMacTabBottomMargin = 0 ;

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


@@ -49,12 +49,12 @@ 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_CHANGING)
 
 BEGIN_EVENT_TABLE(wxNotebook, wxControl)

-    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_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)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)


@@ -76,7 +76,7 @@ void wxNotebook::Init()
     {
         if ( UMAHasAquaLayout() )
         {
     {
         if ( UMAHasAquaLayout() )
         {

-      // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)
+            // I got these values for Mac OS X from the Appearance mgr docs. (Mark Newsam)

             kwxMacTabLeftMargin = 20 ;
             kwxMacTabTopMargin = 38 ;
             kwxMacTabRightMargin = 20 ;
             kwxMacTabLeftMargin = 20 ;
             kwxMacTabTopMargin = 38 ;
             kwxMacTabRightMargin = 20 ;


@@ -96,7 +96,7 @@ void wxNotebook::Init()
         m_macHorizontalBorder = 7;
         m_macVerticalBorder = 8;
     }
         m_macHorizontalBorder = 7;
         m_macVerticalBorder = 8;
     }

-
+    

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


@@ -115,7 +115,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,22 +127,31 @@ 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 = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
-               kControlTabSmallProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-       return TRUE ;
+    Rect bounds ;
+    Str255 title ;
+    
+    MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+    
+    int tabstyle = kControlTabSmallNorthProc ;
+    if ( HasFlag(wxNB_LEFT) )
+        tabstyle = kControlTabSmallWestProc ;
+    else if ( HasFlag( wxNB_RIGHT ) )
+        tabstyle = kControlTabSmallEastProc ;
+    else if ( HasFlag( wxNB_BOTTOM ) )
+        tabstyle = kControlTabSmallSouthProc ;
+    
+    
+    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
+        tabstyle , (long) this ) ;
+    
+    MacPostControlCreate() ;
+    return TRUE ;

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

-       m_macControl = NULL ;
+    m_macControl = NULL ;

 }
 
 wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
 }
 
 wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)


@@ -153,7 +162,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
     wxGetOsVersion( &major, &minor );
     
     // Mac has large notebook borders. Aqua even more so.
     wxGetOsVersion( &major, &minor );
     
     // 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;


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

-
+    

     return sizeTotal;
 }
 
     return sizeTotal;
 }
 


@@ -186,7 +195,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage)
 
 void wxNotebook::SetPadding(const wxSize& padding)
 {
 
 void wxNotebook::SetPadding(const wxSize& padding)
 {

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

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


@@ -201,30 +210,31 @@ void wxNotebook::SetPageSize(const wxSize& size)
 
 int wxNotebook::SetSelection(int nPage)
 {
 
 int wxNotebook::SetSelection(int nPage)
 {

-  if( !IS_VALID_PAGE(nPage) ) 
-    return m_nSelection ;
-
+    if( !IS_VALID_PAGE(nPage) ) 
+        return m_nSelection ;
+    

     ChangePage(m_nSelection, nPage);
     ChangePage(m_nSelection, nPage);

-       SetControlValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
-
+    SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ;
+    
+    Refresh();

     return m_nSelection;
 }
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
     return m_nSelection;
 }
 
 bool wxNotebook::SetPageText(int nPage, const wxString& strText)
 {
     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;
 }
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );
     return true;
 }
 
 wxString wxNotebook::GetPageText(int nPage) const
 {
     wxASSERT( IS_VALID_PAGE(nPage) );

-
+    

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


@@ -232,18 +242,28 @@ wxString wxNotebook::GetPageText(int nPage) const
 int wxNotebook::GetPageImage(int nPage) const
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );
 int wxNotebook::GetPageImage(int nPage) const
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") );

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

 }
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );
 }
 
 bool wxNotebook::SetPageImage(int nPage, int nImage)
 {
     wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("invalid notebook page") );

-
+    

     wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,
     wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), FALSE,

-                 _T("invalid image index in SetPageImage()") );
-
-    return 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;
+        
+        MacSetupTabs() ;
+    }
+    
+    return TRUE;

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


@@ -256,9 +276,9 @@ wxNotebookPage* wxNotebook::DoRemovePage(int 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()) {
         m_nSelection = GetPageCount() - 1;
     }
     if(m_nSelection >= GetPageCount()) {
         m_nSelection = GetPageCount() - 1;
     }


@@ -272,10 +292,10 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage)
 bool wxNotebook::DeleteAllPages()
 {
     // TODO: delete native widget pages
 bool wxNotebook::DeleteAllPages()
 {
     // TODO: delete native widget pages

-
+    

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

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -289,14 +309,16 @@ bool wxNotebook::InsertPage(int nPage,
 {
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
 {
     wxASSERT( pPage != NULL );
     wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );

-
+    

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

-
+    

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

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

     MacSetupTabs();
     MacSetupTabs();

-
+    

     if ( bSelect ) {
         m_nSelection = nPage;
     }
     if ( bSelect ) {
         m_nSelection = nPage;
     }


@@ -308,46 +330,72 @@ bool wxNotebook::InsertPage(int nPage,
     }
     // don't show pages by default (we'll need to adjust their size first)
     pPage->Show( false ) ;
     }
     // don't show pages by default (we'll need to adjust their size first)
     pPage->Show( false ) ;

-
+    

     int h, w;
     GetSize(&w, &h);
     pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
     int h, w;
     GetSize(&w, &h);
     pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,

-                   w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
-                   h - kwxMacTabTopMargin - kwxMacTabBottomMargin );
+        w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
+        h - kwxMacTabTopMargin - kwxMacTabBottomMargin );

     if ( pPage->GetAutoLayout() ) {
         pPage->Layout();
     }
     if ( pPage->GetAutoLayout() ) {
         pPage->Layout();
     }

-
+    

     return true;
 }
 
 /* Added by Mark Newsam
     return true;
 }
 
 /* Added by Mark Newsam

- * When a page is added or deleted to the notebook this function updates
- * information held in the m_macControl so that it matches the order
- * the user would expect.
- */
+* 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.
+*/

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

-    SetControlMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;
-
+    SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ;
+    

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

-    Boolean enabled = true;
+    

     for(int ii = 0; ii < GetPageCount(); ii++)
     {
         page = m_pages[ii];
         info.version = 0;
         info.iconSuiteID = 0;
 #if TARGET_CARBON
     for(int ii = 0; ii < GetPageCount(); ii++)
     {
         page = m_pages[ii];
         info.version = 0;
         info.iconSuiteID = 0;
 #if TARGET_CARBON

-               c2pstrcpy( (StringPtr) info.name , page->GetLabel() ) ;
+        c2pstrcpy( (StringPtr) info.name , page->GetLabel() ) ;

 #else
 #else

-               strcpy( (char *) info.name , page->GetLabel() ) ;
-               c2pstr( (char *) info.name ) ;
+        strcpy( (char *) info.name , page->GetLabel() ) ;
+        c2pstr( (char *) info.name ) ;

 #endif
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,
 #endif
         SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag,

-                        sizeof( ControlTabInfoRec) , (char*) &info ) ;
-        SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabEnabledFlagTag,
-                        sizeof( Boolean ), (Ptr)&enabled );
+            sizeof( ControlTabInfoRec) , (char*) &info ) ;
+        SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ;
+#if 0 // 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 
+            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 ) ;
+        }
+#endif

     }
     Rect bounds;
     GetControlBounds((ControlHandle)m_macControl, &bounds);
     }
     Rect bounds;
     GetControlBounds((ControlHandle)m_macControl, &bounds);


@@ -367,22 +415,22 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     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];
         pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin,
     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 );
+            w - kwxMacTabLeftMargin - kwxMacTabRightMargin,
+            h - kwxMacTabTopMargin - kwxMacTabBottomMargin );

         if ( pPage->GetAutoLayout() ) {
             pPage->Layout();
         }
     }
         if ( pPage->GetAutoLayout() ) {
             pPage->Layout();
         }
     }

-
+    

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


@@ -392,7 +440,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();
 }


@@ -402,7 +450,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();
 }
 


@@ -460,93 +508,93 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
         pPage->SetFocus();
         return;
     }
         pPage->SetFocus();
         return;
     }

-
+    

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

-
+    

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

-
+    

     m_nSelection = nSel;
 }
 
 
 void  wxNotebook::OnMouse( wxMouseEvent &event )
 {
     m_nSelection = nSel;
 }
 
 
 void  wxNotebook::OnMouse( wxMouseEvent &event )
 {

-   if ( (ControlHandle) m_macControl == NULL )
-   {
-      event.Skip() ;
-      return ;
-   }
-
-   if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
-   {
-      int x = event.m_x ;
-      int y = event.m_y ;
-
-      MacClientToRootWindow( &x , &y ) ;
-
-      ControlHandle   control ;
-      Point       localwhere ;
-      SInt16      controlpart ;
-
-      localwhere.h = x ;
-      localwhere.v = y ;
-
-      short modifiers = 0;
-
-      if ( !event.m_leftDown && !event.m_rightDown )
-           modifiers  |= btnState ;
-
-      if ( event.m_shiftDown )
-           modifiers |= shiftKey ;
-
-      if ( event.m_controlDown )
-           modifiers |= controlKey ;
-
-      if ( event.m_altDown )
-           modifiers |= optionKey ;
-
-      if ( event.m_metaDown )
-           modifiers |= cmdKey ;
-
-      control = (ControlHandle) m_macControl ;
-      if ( control && ::IsControlActive( control ) )
-      {
-           {
-            wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
-                                    ::GetControlValue(control) - 1, m_nSelection);
-               changing.SetEventObject(this);
-               ProcessEvent(changing);
- 
-               if(changing.IsAllowed())
-               {
-              controlpart = ::HandleControlClick(control, localwhere, modifiers,
-                                                 (ControlActionUPP) -1);
-              wxTheApp->s_lastMouseDown = 0 ;
-     
-              wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
-                                    ::GetControlValue(control) - 1, m_nSelection);
-              event.SetEventObject(this);
-     
-              ProcessEvent(event);
-               }
-           }
-       }
-   }
+    if ( (ControlHandle) m_macControl == NULL )
+    {
+        event.Skip() ;
+        return ;
+    }
+    
+    if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
+    {
+        int x = event.m_x ;
+        int y = event.m_y ;
+        
+        MacClientToRootWindow( &x , &y ) ;
+        
+        ControlHandle   control ;
+        Point       localwhere ;
+        SInt16      controlpart ;
+        
+        localwhere.h = x ;
+        localwhere.v = y ;
+        
+        short modifiers = 0;
+        
+        if ( !event.m_leftDown && !event.m_rightDown )
+            modifiers  |= btnState ;
+        
+        if ( event.m_shiftDown )
+            modifiers |= shiftKey ;
+        
+        if ( event.m_controlDown )
+            modifiers |= controlKey ;
+        
+        if ( event.m_altDown )
+            modifiers |= optionKey ;
+        
+        if ( event.m_metaDown )
+            modifiers |= cmdKey ;
+        
+        control = (ControlHandle) m_macControl ;
+        if ( control && ::IsControlActive( control ) )
+        {
+            {
+                wxNotebookEvent changing(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId,
+                    ::GetControl32BitValue(control) - 1, m_nSelection);
+                changing.SetEventObject(this);
+                ProcessEvent(changing);
+                
+                if(changing.IsAllowed())
+                {
+                    controlpart = ::HandleControlClick(control, localwhere, modifiers,
+                        (ControlActionUPP) -1);
+                    wxTheApp->s_lastMouseDown = 0 ;
+                    
+                    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId,
+                        ::GetControl32BitValue(control) - 1, m_nSelection);
+                    event.SetEventObject(this);
+                    
+                    ProcessEvent(event);
+                }
+            }
+        }
+    }

 }
 }

- 
+

 
 void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
 #if 0
 
 void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
 #if 0

-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue((ControlHandle)m_macControl) - 1, m_nSelection);
-  event.SetEventObject(this);
-
-  ProcessEvent(event);
+    wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlHandle)m_macControl) - 1, m_nSelection);
+    event.SetEventObject(this);
+    
+    ProcessEvent(event);

 #endif
 }
 
 #endif
 }