simplifying

[wxWidgets.git] / src / mac / carbon / notebmac.cpp

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index e3ffb8f3adbd2bc2511f2bd7dc71b50d857cb57a..bbdff77f029ccdde27d382762f31f5ab851b0cbe 100644 (file)
--- 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;
 
 {
     int resultV = wxNOT_FOUND;
 

-#if TARGET_API_MAC_OSX

     const int countPages = GetPageCount();
 
     // we have to convert from Client to Window relative coordinates
     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 ;
 
     if ( outPart >= 1 && outPart <= countPages )
         resultV = outPart - 1 ;

-#endif // TARGET_API_MAC_OSX

 
     if (flags != NULL)
     {
 
     if (flags != NULL)
     {


@@ -405,7 +403,7 @@ void wxNotebook::MacSetupTabs()
         info.name = cflabel ;
         m_peer->SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
 
         info.name = cflabel ;
         m_peer->SetData<ControlTabInfoRecV1>( 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() )
         {
             const wxBitmap bmap = GetImageList()->GetBitmap( GetPageImage( ii ) ) ;
             if ( bmap.Ok() )


@@ -424,13 +422,7 @@ void wxNotebook::MacSetupTabs()
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 
         m_peer->SetTabEnabled( ii + 1, true ) ;
     }
 

-#if wxMAC_USE_CORE_GRAPHICS

     Refresh();
     Refresh();

-#else
-    Rect bounds;
-    m_peer->GetRectInWindowCoords( &bounds ) ;
-    InvalWindowRect( (WindowRef)MacGetTopLevelWindowRef(), &bounds );
-#endif

 }
 
 wxRect wxNotebook::GetPageRect() const
 }
 
 wxRect wxNotebook::GetPageRect() const