X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d46359178b28cd86e189e877015a8e69ff5bbaa..c944775f72435d2c0493113e05445898ab8baf1b:/src/mac/carbon/notebmac.cpp diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp index e3ffb8f3ad..bbdff77f02 100644 --- a/src/mac/carbon/notebmac.cpp +++ b/src/mac/carbon/notebmac.cpp @@ -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) { @@ -405,7 +403,7 @@ void wxNotebook::MacSetupTabs() 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