X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d46359178b28cd86e189e877015a8e69ff5bbaa..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/notebmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index e3ffb8f3ad..7f82d490f7 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -34,7 +34,7 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) -BEGIN_EVENT_TABLE(wxNotebook, wxControl) +BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) @@ -42,7 +42,7 @@ BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) @@ -187,7 +187,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("SetPageText: invalid notebook page") ); wxNotebookPage *page = m_pages[nPage]; - page->SetLabel(strText); + page->SetLabel(wxStripMenuCodes(strText)); MacSetupTabs(); return true; @@ -281,7 +281,7 @@ bool wxNotebook::InsertPage(size_t nPage, // don't show pages by default (we'll need to adjust their size first) pPage->Show( false ) ; - pPage->SetLabel( strText ); + pPage->SetLabel( wxStripMenuCodes(strText) ); m_images.Insert( imageId, nPage ); @@ -326,7 +326,6 @@ 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 @@ -367,7 +366,6 @@ int wxNotebook::HitTest(const wxPoint& pt, long * flags) const if ( outPart >= 1 && outPart <= countPages ) resultV = outPart - 1 ; -#endif // TARGET_API_MAC_OSX if (flags != NULL) { @@ -401,11 +399,11 @@ void wxNotebook::MacSetupTabs() page = m_pages[ii]; info.version = kControlTabInfoVersionOne; info.iconSuiteID = 0; - wxMacCFStringHolder cflabel( page->GetLabel(), m_font.GetEncoding() ) ; + wxCFStringRef cflabel( page->GetLabel(), GetFont().GetEncoding() ) ; info.name = cflabel ; m_peer->SetData( ii + 1, kControlTabInfoTag, &info ) ; - if ( GetImageList() && GetPageImage(ii) >= 0 && UMAGetSystemVersion() >= 0x1020 ) + if ( GetImageList() && GetPageImage(ii) >= 0 ) { const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ; if ( bmap.Ok() ) @@ -424,13 +422,7 @@ 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 @@ -517,7 +509,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) event.SetEventObject( this ); wxWindow *page = m_pages[m_nSelection]; - if ( !page->GetEventHandler()->ProcessEvent( event ) ) + if ( !page->HandleWindowEvent( event ) ) { page->SetFocus(); } @@ -535,7 +527,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) if ( parent ) { event.SetCurrentFocus( this ); - parent->GetEventHandler()->ProcessEvent( event ); + parent->HandleWindowEvent( event ); } } } @@ -602,7 +594,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId, newSel , m_nSelection ); changing.SetEventObject( this ); - GetEventHandler()->ProcessEvent( changing ); + HandleWindowEvent( changing ); if ( changing.IsAllowed() ) { @@ -610,7 +602,7 @@ wxInt32 wxNotebook::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTR wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, m_windowId, newSel, m_nSelection ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } else {