X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/511bec9640556c23969942f7912ada90c19d36ac..19cf1ef3a7077dd99a90f141847b8a9b67b318c9:/src/mac/carbon/notebmac.cpp diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index 04c84ae3cd..2aff7f536b 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -19,11 +19,11 @@ #include "wx/string.h" #include "wx/log.h" #include "wx/app.h" + #include "wx/image.h" #endif #include "wx/string.h" #include "wx/imaglist.h" -#include "wx/image.h" #include "wx/mac/uma.h" @@ -82,7 +82,7 @@ bool wxNotebook::Create( wxWindow *parent, if (! (style & wxBK_ALIGN_MASK)) style |= wxBK_TOP; - + if ( !wxNotebookBase::Create( parent, id, pos, size, style, name ) ) return false; @@ -160,25 +160,27 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const return DoGetSizeFromClientSize( sizePage ); } -int wxNotebook::SetSelection(size_t nPage) +int wxNotebook::DoSetSelection(size_t nPage, int flags) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("SetSelection: invalid notebook page") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("DoSetSelection: invalid notebook page") ); - if ( int(nPage) != m_nSelection ) + if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)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() ) + if ( flags & SetSelection_SendEvent ) { - // program allows the page change - event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(event); + if ( !SendPageChangingEvent(nPage) ) + { + // vetoed by program + return m_nSelection; + } + //else: program allows the page change - ChangePage(m_nSelection, nPage); + SendPageChangedEvent(m_nSelection, nPage); } + + ChangePage(m_nSelection, nPage); } + //else: no change return m_nSelection; } @@ -376,9 +378,9 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const // we cannot differentiate better if (resultV >= 0) - *flags |= wxNB_HITTEST_ONLABEL; + *flags |= wxBK_HITTEST_ONLABEL; else - *flags |= wxNB_HITTEST_NOWHERE; + *flags |= wxBK_HITTEST_NOWHERE; } return resultV; @@ -425,9 +427,13 @@ void wxNotebook::MacSetupTabs() m_peer->SetTabEnabled( ii + 1, true ) ; } +#if wxMAC_USE_CORE_GRAPHICS + Refresh(); +#else Rect bounds; m_peer->GetRectInWindowCoords( &bounds ) ; InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds ); +#endif } wxRect wxNotebook::GetPageRect() const