X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6b1d97e741fda8d579fa21cbc89f0c91615cef..40989e46b86777dd211faeb3e5d2366cdcc6d8cd:/src/mac/carbon/notebmac.cpp?ds=inline diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index ab97b53540..26decfafb2 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -1,49 +1,41 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp +// Name: src/mac/carbon/notebmac.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 /////////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ +#include "wx/wxprec.h" -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "notebook.h" +#if wxUSE_NOTEBOOK + +#include "wx/notebook.h" + +#ifndef WX_PRECOMP + #include "wx/string.h" #endif -#include -#include -#include -#include -#include -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- +#include "wx/app.h" +#include "wx/string.h" +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/image.h" +#include "wx/mac/uma.h" + // check that the page index is valid -#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount())) +#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) -const short kwxMacTabLeftMargin = 16 ; -const short kwxMacTabTopMargin = 30 ; -const short kwxMacTabRightMargin = 16 ; -const short kwxMacTabBottomMargin = 16 ; -// ---------------------------------------------------------------------------- -// event table -// ---------------------------------------------------------------------------- +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) - EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) + EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) EVT_SET_FOCUS(wxNotebook::OnSetFocus) @@ -52,20 +44,11 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) -#endif - -// ============================================================================ -// implementation -// ============================================================================ -// ---------------------------------------------------------------------------- -// wxNotebook construction -// ---------------------------------------------------------------------------- // common part of all ctors void wxNotebook::Init() { - m_pImageList = NULL; m_nSelection = -1; } @@ -76,206 +59,379 @@ 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 ) { - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; - - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, - kControlTabSmallProc , (long) this ) ; - - MacPostControlCreate() ; - return TRUE ; + m_macIsUserPane = false ; + + if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) ) + return false; + + Rect bounds = wxMacGetBoundsForControl( this, pos, size ); + + if ( bounds.right <= bounds.left ) + bounds.right = bounds.left + 100; + if ( bounds.bottom <= bounds.top ) + bounds.bottom = bounds.top + 100; + + UInt16 tabstyle = kControlTabDirectionNorth; + if ( HasFlag(wxBK_LEFT) ) + tabstyle = kControlTabDirectionWest; + else if ( HasFlag( wxBK_RIGHT ) ) + tabstyle = kControlTabDirectionEast; + else if ( HasFlag( wxBK_BOTTOM ) ) + tabstyle = kControlTabDirectionSouth; + + ControlTabSize tabsize; + switch (GetWindowVariant()) + { + case wxWINDOW_VARIANT_MINI: + if ( UMAGetSystemVersion() >= 0x1030 ) + tabsize = 3 ; + else + tabsize = kControlSizeSmall; + break; + + case wxWINDOW_VARIANT_SMALL: + tabsize = kControlTabSizeSmall; + break; + + default: + tabsize = kControlTabSizeLarge; + break; + } + + 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 wxNotebook::~wxNotebook() { - m_macControl = NULL ; } // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- -int wxNotebook::GetPageCount() const + +void wxNotebook::SetPadding(const wxSize& padding) { - return m_aPages.Count(); + // unsupported by OS } -int wxNotebook::GetRowCount() const +void wxNotebook::SetTabSize(const wxSize& sz) { - return 1; + // unsupported by OS } -int wxNotebook::SetSelection(int nPage) +void wxNotebook::SetPageSize(const wxSize& size) { - wxASSERT( IS_VALID_PAGE(nPage) ); - - ChangePage(m_nSelection, nPage); - SetControlValue( m_macControl , m_nSelection + 1 ) ; -// Boolean enabled = true ; - -// SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled ); - return m_nSelection; + SetSize( CalcSizeFromPage( size ) ); } -void wxNotebook::AdvanceSelection(bool bForward) +wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { - int nSel = GetSelection(); - int nMax = GetPageCount() - 1; - if ( bForward ) - SetSelection(nSel == nMax ? 0 : nSel + 1); - else - SetSelection(nSel == 0 ? nMax : nSel - 1); + return DoGetSizeFromClientSize( sizePage ); } -bool wxNotebook::SetPageText(int nPage, const wxString& strText) +int wxNotebook::SetSelection(size_t nPage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("SetSelection: invalid notebook page") ); + + if ( int(nPage) != m_nSelection ) + { + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId); + event.SetSelection(nPage); + event.SetOldSelection(m_nSelection); + event.SetEventObject(this); + if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) + { + // program allows the page change + event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); + (void)GetEventHandler()->ProcessEvent(event); + + ChangePage(m_nSelection, nPage); + } + } - // TODO - return FALSE; + return m_nSelection; } -wxString wxNotebook::GetPageText(int nPage) const +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); + MacSetupTabs(); - // TODO - return wxString(""); + return true; } -int wxNotebook::GetPageImage(int nPage) const +wxString wxNotebook::GetPageText(size_t nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("GetPageText: invalid notebook page") ); - // TODO - return 0; + wxNotebookPage *page = m_pages[nPage]; + + return page->GetLabel(); } -bool wxNotebook::SetPageImage(int nPage, int nImage) +int wxNotebook::GetPageImage(size_t nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("GetPageImage: invalid notebook page") ); - // TODO - return FALSE; + return m_images[nPage]; } -void wxNotebook::SetImageList(wxImageList* imageList) -{ - m_pImageList = imageList; - // TODO +bool wxNotebook::SetPageImage(size_t nPage, int nImage) +{ + 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] ) + { + // 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; } // ---------------------------------------------------------------------------- // wxNotebook operations // ---------------------------------------------------------------------------- -// remove one page from the notebook -bool wxNotebook::DeletePage(int nPage) +// remove one page from the notebook, without deleting the window +wxNotebookPage* wxNotebook::DoRemovePage(size_t nPage) { - wxCHECK( IS_VALID_PAGE(nPage), FALSE ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), NULL, + wxT("DoRemovePage: invalid notebook page") ); - // TODO: delete native widget page + wxNotebookPage* page = m_pages[nPage] ; + m_pages.RemoveAt(nPage); - delete m_aPages[nPage]; - m_aPages.Remove(nPage); + MacSetupTabs(); - return TRUE; -} + if (m_nSelection >= (int)GetPageCount()) + m_nSelection = GetPageCount() - 1; -// remove one page from the notebook, without deleting the window -bool wxNotebook::RemovePage(int nPage) -{ - wxCHECK( IS_VALID_PAGE(nPage), FALSE ); + if (m_nSelection >= 0) + m_pages[m_nSelection]->Show(true); - m_aPages.Remove(nPage); + InvalidateBestSize(); - return TRUE; + return page; } // remove all pages bool wxNotebook::DeleteAllPages() { - // TODO: delete native widget pages + WX_CLEAR_ARRAY(m_pages) ; + MacSetupTabs(); + m_nSelection = -1 ; + 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 ) +{ + if ( !wxNotebookBase::InsertPage( nPage, pPage, strText, bSelect, imageId ) ) + return false; + + 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 ); + + m_images.Insert( imageId, nPage ); + + MacSetupTabs(); - int nPageCount = GetPageCount(); - int nPage; - for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_aPages[nPage]; + wxRect rect = GetPageRect() ; + pPage->SetSize( rect ); + if ( pPage->GetAutoLayout() ) + pPage->Layout(); - m_aPages.Clear(); + // now deal with the selection + // --------------------------- - return TRUE; + // if the inserted page is before the selected one, we must update the + // index of the selected page + + if ( int(nPage) <= m_nSelection ) + { + m_nSelection++; + + // while this still is the same page showing, we need to update the tabs + m_peer->SetValue( m_nSelection + 1 ) ; + } + + // some page should be selected: either this one or the first one if there + // is still no selection + int selNew = -1; + if ( bSelect ) + selNew = nPage; + else if ( m_nSelection == -1 ) + selNew = 0; + + if ( selNew != -1 ) + SetSelection( selNew ); + + InvalidateBestSize(); + + return true; } -// add a page to the notebook -bool wxNotebook::AddPage(wxNotebookPage *pPage, - const wxString& strText, - bool bSelect, - int imageId) +int wxNotebook::HitTest(const wxPoint& pt, long * flags) const { - return InsertPage(GetPageCount(), pPage, strText, bSelect, imageId); + 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 |= wxNB_HITTEST_ONLABEL; + else + *flags |= wxNB_HITTEST_NOWHERE; + } + + return resultV; } -// same as AddPage() but does it at given position -bool wxNotebook::InsertPage(int nPage, - wxNotebookPage *pPage, - const wxString& strText, - bool bSelect, - int imageId) +// 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() { - wxASSERT( pPage != NULL ); - wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE ); - - ControlTabInfoRec tie ; - Boolean enabled = true ; - if ( nPage + 1 > GetControlMaximum( m_macControl ) ) - { - SetControlMaximum( m_macControl , nPage + 1 ) ; - } - - tie.version = 0 ; - tie.iconSuiteID = 0 ; - strcpy( (char*) tie.name , strText ) ; - c2pstr( (char*) tie.name ) ; - SetControlData( m_macControl, nPage + 1, kControlTabInfoTag , sizeof( ControlTabInfoRec) , (char*) &tie ) ; - SetControlData( m_macControl, m_nSelection + 1, kControlTabEnabledFlagTag, sizeof( Boolean ), (Ptr)&enabled ); - - // save the pointer to the page - m_aPages.Insert(pPage, nPage); - - // some page must be selected: either this one or the first one if there is - // still no selection - if ( bSelect ) - m_nSelection = nPage; - else if ( m_nSelection == -1 ) - m_nSelection = 0; + m_peer->SetMaximum( GetPageCount() ) ; + + wxNotebookPage *page; + ControlTabInfoRecV1 info; + + const size_t countPages = GetPageCount(); + for (size_t ii = 0; ii < countPages; ii++) + { + page = m_pages[ii]; + info.version = kControlTabInfoVersionOne; + info.iconSuiteID = 0; + wxMacCFStringHolder cflabel( page->GetLabel(), m_font.GetEncoding() ) ; + info.name = cflabel ; + m_peer->SetData( ii + 1, kControlTabInfoTag, &info ) ; + + if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) + { + const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ; + if ( bmap.Ok() ) + { + ControlButtonContentInfo info ; + + wxMacCreateBitmapButton( &info, bmap ) ; + + OSStatus err = m_peer->SetData( ii + 1, kControlTabImageContentTag, &info ); + wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ; + + wxMacReleaseBitmapButton( &info ) ; + } + } + + m_peer->SetTabEnabled( ii + 1, true ) ; + } - // don't show pages by default (we'll need to adjust their size first) - pPage->Show( FALSE ) ; + Rect bounds; + m_peer->GetRectInWindowCoords( &bounds ) ; + InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds ); +} + +wxRect wxNotebook::GetPageRect() const +{ + wxSize size = GetClientSize() ; - return TRUE; + return wxRect( 0 , 0 , size.x , size.y ) ; } // ---------------------------------------------------------------------------- @@ -286,30 +442,13 @@ bool wxNotebook::InsertPage(int nPage, // time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - static bool s_bFirstTime = TRUE; - if ( s_bFirstTime ) { - // TODO: any first-time-size processing. - s_bFirstTime = FALSE; - } - - // TODO: all this may or may not be necessary for your platform + unsigned int nCount = m_pages.Count(); + wxRect rect = GetPageRect() ; - // emulate page change (it's esp. important to do it first time because - // otherwise our page would stay invisible) - int nSel = m_nSelection; - m_nSelection = -1; - SetSelection(nSel); - - // fit the notebook page to the tab control's display area - int w, h; - GetSize(&w, &h); - - unsigned int nCount = m_aPages.Count(); - for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) { - wxNotebookPage *pPage = m_aPages[nPage]; - pPage->SetSize(kwxMacTabLeftMargin, kwxMacTabTopMargin, w - kwxMacTabLeftMargin - kwxMacTabRightMargin, - h - kwxMacTabTopMargin - kwxMacTabBottomMargin ); -// pPage->SetSize(0, 0, w, h); + for ( unsigned int nPage = 0; nPage < nCount; nPage++ ) + { + wxNotebookPage *pPage = m_pages[nPage]; + pPage->SetSize(rect); if ( pPage->GetAutoLayout() ) pPage->Layout(); } @@ -332,22 +471,66 @@ void wxNotebook::OnSetFocus(wxFocusEvent& event) { // set focus to the currently selected page if any if ( m_nSelection != -1 ) - m_aPages[m_nSelection]->SetFocus(); + m_pages[m_nSelection]->SetFocus(); event.Skip(); } void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { - if ( event.IsWindowChange() ) { + if ( event.IsWindowChange() ) + { // change pages - AdvanceSelection(event.GetDirection()); + AdvanceSelection( event.GetDirection() ); } - else { - // pass to the parent - if ( GetParent() ) { - event.SetCurrentFocus(this); - GetParent()->ProcessEvent(event); + else + { + // 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 fix 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 ); + } } } } @@ -356,22 +539,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); + 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")); } // ---------------------------------------------------------------------------- @@ -381,33 +568,53 @@ 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 ) - { - wxNotebookPage *pPage = m_aPages[nSel]; - pPage->Show(FALSE); - pPage->Show(TRUE); - pPage->SetFocus(); - return; - } - - if ( nOldSel != -1 ) { - m_aPages[nOldSel]->Show(FALSE); - } + if (nOldSel == nSel) + return; - wxNotebookPage *pPage = m_aPages[nSel]; - pPage->Show(TRUE); - pPage->SetFocus(); + if ( nOldSel != -1 ) + m_pages[nOldSel]->Show( false ); + + if ( nSel != -1 ) + { + wxNotebookPage *pPage = m_pages[nSel]; + pPage->Show( true ); + pPage->SetFocus(); + } m_nSelection = nSel; + m_peer->SetValue( m_nSelection + 1 ) ; } -void wxNotebook::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) ) { - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId , ::GetControlValue(m_macControl) - 1, m_nSelection); - event.SetEventObject(this); + OSStatus status = eventNotHandledErr ; + + SInt32 newSel = m_peer->GetValue() - 1 ; + if ( newSel != m_nSelection ) + { + wxNotebookEvent changing( + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, + newSel , m_nSelection ); + changing.SetEventObject( this ); + GetEventHandler()->ProcessEvent( changing ); + + if ( changing.IsAllowed() ) + { + wxNotebookEvent event( + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId, + newSel, m_nSelection ); + event.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event ); + } + else + { + m_peer->SetValue( m_nSelection + 1 ) ; + } - ProcessEvent(event); + status = noErr ; + } + + return (wxInt32)status ; } +#endif