wxStringTokenizer::GetLastDelimiter is new since 2.7.0

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 89f0d0e12705f8df38b77f9e84c97e90f88ac565..8bc85846cc7187d838bb75b8a9ac51b903760ecb 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bitmap.cpp
+// Name:        src/mac/carbon/bitmap.cpp

 // Purpose:     wxBitmap
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxBitmap
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,8 +12,13 @@
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"

-#include "wx/icon.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcmemory.h"
+    #include "wx/icon.h"
+#endif
+

 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"
 #include "wx/image.h"
 #include "wx/metafile.h"
 #include "wx/xpmdecod.h"


@@ -31,7 +36,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 #endif
 
 #include "wx/mac/uma.h"
 #endif
 
 #include "wx/mac/uma.h"

-#include "wx/dcmemory.h"

 
 // Implementation Notes
 // --------------------
 
 // Implementation Notes
 // --------------------


@@ -392,9 +396,14 @@ IconRef wxBitmapRefData::GetIconRef()
             PicHandle pic = GetPictHandle() ;
             SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
         }
             PicHandle pic = GetPictHandle() ;
             SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
         }

-

         // transform into IconRef
         // transform into IconRef

-
+#ifdef __WXMAC_OSX__
+        // cleaner version existing from 10.3 upwards
+        HLock((Handle) iconFamily);
+        OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &m_iconRef );
+        HUnlock((Handle) iconFamily);
+        wxASSERT_MSG( err == noErr , wxT("Error when constructing icon ref") );
+#else

         static int iconCounter = 2 ;
 
         OSStatus err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ;
         static int iconCounter = 2 ;
 
         OSStatus err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ;


@@ -403,8 +412,9 @@ IconRef wxBitmapRefData::GetIconRef()
         // we have to retain a reference, as Unregister will decrement it
         AcquireIconRef( m_iconRef ) ;
         UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;
         // we have to retain a reference, as Unregister will decrement it
         AcquireIconRef( m_iconRef ) ;
         UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;

-        DisposeHandle( (Handle) iconFamily ) ;

         ++iconCounter ;
         ++iconCounter ;

+#endif
+        DisposeHandle( (Handle) iconFamily ) ;

     }
 
     return m_iconRef ;
     }
 
     return m_iconRef ;