X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/facd6764872eede45605ba7c9dfa0e1d0c708fa2..ccd67a6af88981a8c1a2b752a14051fe7698814b:/src/mac/carbon/notebmac.cpp?ds=inline diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 91c17ee434..2aff7f536b 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/mac/carbon/notebmac.cpp // Purpose: implementation of wxNotebook // Author: Stefan Csomor // Modified by: @@ -9,42 +9,33 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "notebook.h" -#endif +#include "wx/wxprec.h" -// ============================================================================ -// declarations -// ============================================================================ +#if wxUSE_NOTEBOOK + +#include "wx/notebook.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/image.h" +#endif -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#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 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- - 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(wxID_ANY, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) EVT_SET_FOCUS(wxNotebook::OnSetFocus) @@ -54,13 +45,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxNotebook construction -// ---------------------------------------------------------------------------- // common part of all ctors void wxNotebook::Init() @@ -75,61 +59,76 @@ wxNotebook::wxNotebook() } // the same arguments as for wxControl -wxNotebook::wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +wxNotebook::wxNotebook( wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { Init(); - Create(parent, id, pos, size, style, name); + Create( parent, id, pos, size, style, name ); } -// Create() function -bool wxNotebook::Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +bool wxNotebook::Create( wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { - m_macIsUserPane = FALSE ; - - if ( !wxNotebookBase::Create(parent, id, pos, size, style, name) ) + m_macIsUserPane = false ; + + if (! (style & wxBK_ALIGN_MASK)) + style |= wxBK_TOP; + + if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) ) return false; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); - if( bounds.right <= bounds.left ) - bounds.right = bounds.left + 100 ; + 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 ) + bounds.bottom = bounds.top + 100; + + UInt16 tabstyle = kControlTabDirectionNorth; + if ( HasFlag(wxBK_LEFT) ) + tabstyle = kControlTabDirectionWest; + else if ( HasFlag( wxBK_RIGHT ) ) + tabstyle = kControlTabDirectionEast; + else if ( HasFlag( wxBK_BOTTOM ) ) + tabstyle = kControlTabDirectionSouth; + + ControlTabSize tabsize; + switch (GetWindowVariant()) { - if (UMAGetSystemVersion() >= 0x1030 ) - tabsize = 3 ; - else - tabsize = kControlSizeSmall; + case wxWINDOW_VARIANT_MINI: + if ( UMAGetSystemVersion() >= 0x1030 ) + tabsize = 3 ; + else + tabsize = kControlSizeSmall; + break; + + case wxWINDOW_VARIANT_SMALL: + tabsize = kControlTabSizeSmall; + break; + + default: + tabsize = kControlTabSizeLarge; + break; } - ::CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , tabsize , tabstyle, 0, NULL, (ControlRef*) &m_macControl); - - MacPostControlCreate(pos,size) ; - return TRUE ; + m_peer = new wxMacControl( this ); + OSStatus err = CreateTabsControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, + tabsize, tabstyle, 0, NULL, m_peer->GetControlRefAddr() ); + verify_noerr( err ); + + MacPostControlCreate( pos, size ); + + return true ; } // dtor @@ -158,63 +157,37 @@ void wxNotebook::SetPageSize(const wxSize& size) wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { - return DoGetSizeFromClientSize( sizePage ) ; + return DoGetSizeFromClientSize( sizePage ); } -wxSize wxNotebook::DoGetBestSize() const +int wxNotebook::DoSetSelection(size_t nPage, int flags) { - // calculate the max page size - wxSize size(0, 0); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") ); - size_t count = GetPageCount(); - if ( count ) + if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection ) { - for ( size_t n = 0; n < count; n++ ) + if ( flags & SetSelection_SendEvent ) { - wxSize sizePage = m_pages[n]->GetSize(); + if ( !SendPageChangingEvent(nPage) ) + { + // vetoed by program + return m_nSelection; + } + //else: program allows the page change - if ( size.x < sizePage.x ) - size.x = sizePage.x; - if ( size.y < sizePage.y ) - size.y = sizePage.y; + SendPageChangedEvent(m_nSelection, nPage); } - } - else // no pages - { - // use some arbitrary default size - size.x = - size.y = 100; - } - - return CalcSizeFromPage(size); -} - -int wxNotebook::SetSelection(size_t 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); - } + ChangePage(m_nSelection, nPage); } + //else: no change return m_nSelection; } bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("SetPageText: invalid notebook page") ); wxNotebookPage *page = m_pages[nPage]; page->SetLabel(strText); @@ -225,25 +198,26 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) wxString wxNotebook::GetPageText(size_t nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("GetPageText: invalid notebook page") ); wxNotebookPage *page = m_pages[nPage]; + return page->GetLabel(); } int wxNotebook::GetPageImage(size_t nPage) const { - wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("invalid notebook page") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("GetPageImage: invalid notebook page") ); return m_images[nPage]; } 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()") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), false, + wxT("SetPageImage: invalid notebook page") ); + wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false, + wxT("SetPageImage: invalid image index") ); if ( nImage != m_images[nPage] ) { @@ -255,7 +229,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage) MacSetupTabs() ; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -265,18 +239,22 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage) // remove one page from the notebook, without deleting the window wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage) { - wxCHECK( IS_VALID_PAGE(nPage), NULL ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, + wxT("DoRemovePage: invalid notebook page") ); + wxNotebookPage* page = m_pages[nPage] ; m_pages.RemoveAt(nPage); MacSetupTabs(); - if(m_nSelection >= (int)GetPageCount()) { + if (m_nSelection >= (int)GetPageCount()) m_nSelection = GetPageCount() - 1; - } - if(m_nSelection >= 0) { + + if (m_nSelection >= 0) m_pages[m_nSelection]->Show(true); - } + + InvalidateBestSize(); + return page; } @@ -286,38 +264,36 @@ bool wxNotebook::DeleteAllPages() WX_CLEAR_ARRAY(m_pages) ; MacSetupTabs(); m_nSelection = -1 ; - return TRUE; -} + InvalidateBestSize(); + return true; +} // same as AddPage() but does it at given position bool wxNotebook::InsertPage(size_t nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect, - int imageId) + wxNotebookPage *pPage, + const wxString& strText, + bool bSelect, + int imageId ) { - if ( !wxNotebookBase::InsertPage(nPage, pPage, strText, bSelect, imageId) ) + if ( !wxNotebookBase::InsertPage( nPage, pPage, strText, bSelect, imageId ) ) return false; - wxASSERT_MSG( pPage->GetParent() == this, - _T("notebook pages must have notebook as parent") ); + wxASSERT_MSG( pPage->GetParent() == this, wxT("notebook pages must have notebook as parent") ); // don't show pages by default (we'll need to adjust their size first) pPage->Show( false ) ; - pPage->SetLabel(strText); + pPage->SetLabel( strText ); - m_images.Insert(imageId, nPage); + m_images.Insert( imageId, nPage ); MacSetupTabs(); wxRect rect = GetPageRect() ; - pPage->SetSize(rect); - if ( pPage->GetAutoLayout() ) { + pPage->SetSize( rect ); + if ( pPage->GetAutoLayout() ) pPage->Layout(); - } - // now deal with the selection // --------------------------- @@ -325,13 +301,14 @@ bool wxNotebook::InsertPage(size_t nPage, // if the inserted page is before the selected one, we must update the // index of the selected page - if ( int(nPage) <= m_nSelection ) + if ( int(nPage) <= m_nSelection ) { m_nSelection++; + // while this still is the same page showing, we need to update the tabs - SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ; + 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; @@ -341,86 +318,131 @@ bool wxNotebook::InsertPage(size_t nPage, selNew = 0; if ( selNew != -1 ) - SetSelection(selNew); + SetSelection( selNew ); + + InvalidateBestSize(); 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. -*/ +int wxNotebook::HitTest(const wxPoint& pt, long * flags) const +{ + int resultV = wxNOT_FOUND; + +#if TARGET_API_MAC_OSX + const int countPages = GetPageCount(); + + // we have to convert from Client to Window relative coordinates + wxPoint adjustedPt = pt + GetClientAreaOrigin(); + // and now to HIView native ones + adjustedPt.x -= MacGetLeftBorderSize() ; + adjustedPt.y -= MacGetTopBorderSize() ; + + HIPoint hipoint= { adjustedPt.x , adjustedPt.y } ; + HIViewPartCode outPart = 0 ; + OSStatus err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart ); + + int max = m_peer->GetMaximum() ; + if ( outPart == 0 && max > 0 ) + { + // this is a hack, as unfortunately a hit on an already selected tab returns 0, + // so we have to go some extra miles to make sure we select something different + // and try again .. + int val = m_peer->GetValue() ; + int maxval = max ; + if ( max == 1 ) + { + m_peer->SetMaximum( 2 ) ; + maxval = 2 ; + } + + if ( val == 1 ) + m_peer->SetValue( maxval ) ; + else + m_peer->SetValue( 1 ) ; + + err = HIViewGetPartHit( m_peer->GetControlRef(), &hipoint, &outPart ); + + m_peer->SetValue( val ) ; + if ( max == 1 ) + m_peer->SetMaximum( 1 ) ; + } + + if ( outPart >= 1 && outPart <= countPages ) + resultV = outPart - 1 ; +#endif // TARGET_API_MAC_OSX + + if (flags != NULL) + { + *flags = 0; + + // we cannot differentiate better + if (resultV >= 0) + *flags |= wxBK_HITTEST_ONLABEL; + else + *flags |= wxBK_HITTEST_NOWHERE; + } + + return resultV; +} + +// 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() { - SetControl32BitMaximum( (ControlRef) m_macControl , GetPageCount() ) ; + m_peer->SetMaximum( GetPageCount() ) ; wxNotebookPage *page; - ControlTabInfoRec info; + ControlTabInfoRecV1 info; const size_t countPages = GetPageCount(); - for(size_t ii = 0; ii < countPages; ii++) + for (size_t ii = 0; ii < countPages; ii++) { page = m_pages[ii]; - info.version = 0; + info.version = kControlTabInfoVersionOne; info.iconSuiteID = 0; - wxMacStringToPascal( page->GetLabel() , info.name ) ; + wxMacCFStringHolder cflabel( page->GetLabel(), m_font.GetEncoding() ) ; + info.name = cflabel ; + m_peer->SetData( ii + 1, kControlTabInfoTag, &info ) ; - SetControlData( (ControlRef) m_macControl, ii+1, kControlTabInfoTag, - sizeof( ControlTabInfoRec) , (char*) &info ) ; - SetTabEnabled( (ControlRef) m_macControl , 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 ) + const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ; + if ( bmap.Ok() ) { - 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( (ControlRef) m_macControl, ii+1,kControlTabImageContentTag, - sizeof( info ), (Ptr)&info ); + + wxMacCreateBitmapButton( &info, bmap ) ; + + OSStatus err = m_peer->SetData( 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 ) ; + + wxMacReleaseBitmapButton( &info ) ; } } -#endif + + m_peer->SetTabEnabled( ii + 1, true ) ; } + +#if wxMAC_USE_CORE_GRAPHICS + Refresh(); +#else Rect bounds; - UMAGetControlBoundsInWindowCoords((ControlRef)m_macControl, &bounds); - InvalWindowRect((WindowRef)MacGetTopLevelWindowRef(), &bounds); + m_peer->GetRectInWindowCoords( &bounds ) ; + InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds ); +#endif } wxRect wxNotebook::GetPageRect() const { wxSize size = GetClientSize() ; + return wxRect( 0 , 0 , size.x , size.y ) ; } + // ---------------------------------------------------------------------------- // wxNotebook callbacks // ---------------------------------------------------------------------------- @@ -429,15 +451,15 @@ wxRect wxNotebook::GetPageRect() const // time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - 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_pages[nPage]; pPage->SetSize(rect); - if ( pPage->GetAutoLayout() ) { + if ( pPage->GetAutoLayout() ) pPage->Layout(); - } } // Processing continues to next OnSize @@ -465,11 +487,13 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event) void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { - if ( event.IsWindowChange() ) { + if ( event.IsWindowChange() ) + { // change pages - AdvanceSelection(event.GetDirection()); + AdvanceSelection( event.GetDirection() ); } - else { + else + { // we get this event in 2 cases // // a) one of our pages might have generated it because the user TABbed @@ -484,7 +508,8 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // 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 + + // the cast is here to fix a GCC ICE if ( ((wxWindow*)event.GetEventObject()) == parent ) { // no, it doesn't come from child, case (b): forward to a page @@ -492,10 +517,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { // so that the page knows that the event comes from it's parent // and is being propagated downwards - event.SetEventObject(this); + event.SetEventObject( this ); wxWindow *page = m_pages[m_nSelection]; - if ( !page->GetEventHandler()->ProcessEvent(event) ) + if ( !page->GetEventHandler()->ProcessEvent( event ) ) { page->SetFocus(); } @@ -510,9 +535,10 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) else { // it comes from our child, case (a), pass to the parent - if ( parent ) { - event.SetCurrentFocus(this); - parent->GetEventHandler()->ProcessEvent(event); + if ( parent ) + { + event.SetCurrentFocus( this ); + parent->GetEventHandler()->ProcessEvent( event ); } } } @@ -528,13 +554,13 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) 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 WXUNUSED(nPhase)) { - return TRUE; + return true; } #endif // wxUSE_CONSTRAINTS @@ -551,104 +577,53 @@ void wxNotebook::Command(wxCommandEvent& event) // hide the currently active panel and show the new one void wxNotebook::ChangePage(int nOldSel, int nSel) { - if ( nOldSel != -1 ) - { - m_pages[nOldSel]->Show(FALSE); - } + if (nOldSel == nSel) + return; + + if ( nOldSel != -1 ) + m_pages[nOldSel]->Show( false ); if ( nSel != -1 ) { wxNotebookPage *pPage = m_pages[nSel]; - pPage->Show(TRUE); + pPage->Show( true ); pPage->SetFocus(); } - + m_nSelection = nSel; - SetControl32BitValue( (ControlRef) m_macControl , m_nSelection + 1 ) ; + m_peer->SetValue( m_nSelection + 1 ) ; } - -void wxNotebook::OnMouse( wxMouseEvent &event ) +wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - if ( (ControlRef) m_macControl == NULL ) - { - event.Skip() ; - return ; - } + OSStatus status = eventNotHandledErr ; - if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK ) + SInt32 newSel = m_peer->GetValue() - 1 ; + if ( newSel != m_nSelection ) { - int x = event.m_x ; - int y = event.m_y ; - -#if TARGET_API_MAC_ISX - // OS Needs it in window not client coordinates - wxPoint origin = GetClientAreaOrigin() ; - x += origin.x ; - y += origin.y ; -#else - // OS Needs it in tlw content area coordinates - MacClientToRootWindow( &x , &y ) ; -#endif - - ControlRef control ; - Point localwhere ; - SInt16 controlpart ; + wxNotebookEvent changing( + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, + newSel , m_nSelection ); + changing.SetEventObject( this ); + GetEventHandler()->ProcessEvent( changing ); - 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 = (ControlRef) m_macControl ; - if ( control && ::IsControlActive( control ) ) + if ( changing.IsAllowed() ) { - { - 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); - } - } + 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 ) ; } - } -} - -void wxNotebook::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) ) -{ -#if 0 - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControl32BitValue((ControlRef)m_macControl) - 1, m_nSelection); - event.SetEventObject(this); + status = noErr ; + } - ProcessEvent(event); -#endif + return (wxInt32)status ; } +#endif