X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd47b3d3f33eaa1e6083392922f5a18a828e8bae..3ef37e7f4ec5f0688a4fb47e530ca2d30a6bb3ed:/src/mac/carbon/notebmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 9edaae2764..7de1af74e1 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -1,14 +1,18 @@ /////////////////////////////////////////////////////////////////////////////// // 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$ -// Copyright: (c) AUTHOR +// Copyright: (c) Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +#ifdef __GNUG__ +#pragma implementation "notebook.h" +#endif + // ============================================================================ // declarations // ============================================================================ @@ -16,13 +20,11 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "notebook.h" -#endif - +#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" // ---------------------------------------------------------------------------- @@ -30,25 +32,19 @@ // ---------------------------------------------------------------------------- // check that the page index is valid -#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount())) - -static bool constantsSet = false ; +#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) - short kwxMacTabLeftMargin = 0 ; - short kwxMacTabTopMargin = 0 ; - short kwxMacTabRightMargin = 0 ; - short kwxMacTabBottomMargin = 0 ; // ---------------------------------------------------------------------------- // 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) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) + EVT_MOUSE_EVENTS(wxNotebook::OnMouse) EVT_SIZE(wxNotebook::OnSize) EVT_SET_FOCUS(wxNotebook::OnSetFocus) @@ -57,40 +53,95 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif // ============================================================================ // 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() ) { - // 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 { - kwxMacTabLeftMargin = 16 ; - kwxMacTabTopMargin = 30 ; - kwxMacTabRightMargin = 16 ; - kwxMacTabBottomMargin = 16 ; + tabMargin = 30; +#if wxMAC_EDGE_TO_EDGE + otherMargin = 0; +#else + otherMargin = 16; +#endif + } + } + + // If the style matches the side asked for then return the tab margin, + // but we have to special case wxNB_TOP since it is zero... + if ( side == wxNB_TOP) + { + if ( nbStyle != 0 && nbStyle & (wxNB_LEFT|wxNB_RIGHT|wxNB_BOTTOM)) + { + return otherMargin; + } + else + { + return tabMargin; } - 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() ) { + // Should these depend on wxMAC_EDGE_TO_EDGE too? m_macHorizontalBorder = 7; m_macVerticalBorder = 8; } @@ -125,22 +176,68 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; + if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) ) + return false; + + Rect bounds ; + Str255 title ; + + MacPreControlCreate( parent , id , wxEmptyString , 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 ) ; - m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlTabSmallProc , (long) this ) ; - - MacPostControlCreate() ; - return TRUE ; + MacPostControlCreate() ; + return TRUE ; } // dtor wxNotebook::~wxNotebook() { - m_macControl = NULL ; +} + +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const +{ + wxSize sizeTotal = sizePage; + + int major,minor; + wxGetOsVersion( &major, &minor ); + + // Mac has large notebook borders. Aqua even more so. + + if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) ) + { + sizeTotal.x += 90; + + if (major >= 10) + sizeTotal.y += 28; + else + sizeTotal.y += 20; + } + else + { + if (major >= 10) + { + sizeTotal.x += 34; + sizeTotal.y += 46; + } + else + { + sizeTotal.x += 22; + sizeTotal.y += 44; + } + } + + return sizeTotal; } // ---------------------------------------------------------------------------- @@ -149,7 +246,7 @@ wxNotebook::~wxNotebook() 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) @@ -162,18 +259,30 @@ void wxNotebook::SetPageSize(const wxSize& size) 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 ; + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") ); - ChangePage(m_nSelection, nPage); - SetControlValue( m_macControl , m_nSelection + 1 ) ; + 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; } -bool wxNotebook::SetPageText(int nPage, const wxString& strText) +bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) { wxASSERT( IS_VALID_PAGE(nPage) ); @@ -184,7 +293,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText) return true; } -wxString wxNotebook::GetPageText(int nPage) const +wxString wxNotebook::GetPageText(size_t nPage) const { wxASSERT( IS_VALID_PAGE(nPage) ); @@ -192,21 +301,31 @@ wxString wxNotebook::GetPageText(int nPage) const 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") ); - return 0 ; + 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( m_imageList && nImage < m_imageList->GetImageCount(), FALSE, - _T("invalid image index in SetPageImage()") ); + _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 FALSE; + return TRUE; } // ---------------------------------------------------------------------------- @@ -214,7 +333,7 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) // ---------------------------------------------------------------------------- // 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] ; @@ -222,7 +341,7 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage) MacSetupTabs(); - if(m_nSelection >= GetPageCount()) { + if(m_nSelection >= (int)GetPageCount()) { m_nSelection = GetPageCount() - 1; } if(m_nSelection >= 0) { @@ -234,87 +353,137 @@ wxNotebookPage* wxNotebook::DoRemovePage(int nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - // TODO: delete native widget pages - WX_CLEAR_ARRAY(m_pages) ; MacSetupTabs(); - + m_nSelection = -1 ; 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) { - 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); - // save the pointer to the page - m_pages.Insert(pPage, nPage); + m_images.Insert(imageId, nPage); 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); - 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(); } + + // 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; } /* 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() { - SetControlMaximum( m_macControl , GetPageCount() ) ; + SetControl32BitMaximum( (ControlHandle) m_macControl , GetPageCount() ) ; wxNotebookPage *page; ControlTabInfoRec info; - Boolean enabled = true; - 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; + wxMacStringToPascal( page->GetLabel() , info.name ) ; + + SetControlData( (ControlHandle) m_macControl, ii+1, kControlTabInfoTag, + sizeof( ControlTabInfoRec) , (char*) &info ) ; + SetTabEnabled( (ControlHandle) m_macControl , ii+1 , true ) ; #if TARGET_CARBON - c2pstrcpy( (StringPtr) info.name , page->GetLabel() ) ; -#else - strcpy( (char *) info.name , page->GetLabel() ) ; - c2pstr( (char *) info.name ) ; + 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 ; + 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 - SetControlData( m_macControl, ii+1, kControlTabInfoTag, - sizeof( ControlTabInfoRec) , (char*) &info ) ; - SetControlData( m_macControl, ii+1, kControlTabEnabledFlagTag, - sizeof( Boolean ), (Ptr)&enabled ); } Rect bounds; - GetControlBounds(m_macControl, &bounds); - InvalWindowRect(MacGetRootWindow(), &bounds); + GetControlBounds((ControlHandle)m_macControl, &bounds); + InvalWindowRect((WindowRef)MacGetRootWindow(), &bounds); } // ---------------------------------------------------------------------------- @@ -327,9 +496,11 @@ void wxNotebook::OnSize(wxSizeEvent& event) { // emulate page change (it's esp. important to do it first time because // otherwise our page would stay invisible) + /* int nSel = m_nSelection; m_nSelection = -1; SetSelection(nSel); + */ // fit the notebook page to the tab control's display area int w, h; @@ -338,9 +509,10 @@ void wxNotebook::OnSize(wxSizeEvent& event) 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(); } @@ -376,10 +548,50 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) 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); + } } } } @@ -388,22 +600,26 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // wxNotebook base class virtuals // ---------------------------------------------------------------------------- +#if wxUSE_CONSTRAINTS + // 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) { - wxFAIL_MSG("wxNotebook::Command not implemented"); + wxFAIL_MSG(wxT("wxNotebook::Command not implemented")); } // ---------------------------------------------------------------------------- @@ -413,34 +629,96 @@ void wxNotebook::Command(wxCommandEvent& event) // 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]; - pPage->Show(FALSE); pPage->Show(TRUE); pPage->SetFocus(); - return; } + + m_nSelection = nSel; + SetControl32BitValue( (ControlHandle) m_macControl , m_nSelection + 1 ) ; +} - // Hide previous page - if ( nOldSel != -1 ) { - m_pages[nOldSel]->Show(FALSE); + +void wxNotebook::OnMouse( wxMouseEvent &event ) +{ + if ( (ControlHandle) m_macControl == NULL ) + { + event.Skip() ; + return ; } - wxNotebookPage *pPage = m_pages[nSel]; - pPage->Show(TRUE); - pPage->SetFocus(); + if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) + { + int x = event.m_x ; + int y = event.m_y ; - m_nSelection = nSel; + 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); + GetEventHandler()->ProcessEvent(changing); + + if(changing.IsAllowed()) + { + controlpart = ::HandleControlClick(control, localwhere, modifiers, + (ControlActionUPP) -1); + wxTheApp->s_lastMouseDown = 0 ; + + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId, + ::GetControl32BitValue(control) - 1, m_nSelection); + event.SetEventObject(this); + + GetEventHandler()->ProcessEvent(event); + } + } + } + } } -void wxNotebook::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) + +void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) { - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue(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); + ProcessEvent(event); +#endif }