Border corrections

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index e2b19004cc524812615518b434c5e9d9eedda4b7..1b52261571616a9a0f0af5453609f806a7395c51 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -17,9 +17,9 @@
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/icon.h"
     #include "wx/log.h"
     #include "wx/dcmemory.h"
     #include "wx/icon.h"

+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "wx/image.h"

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


@@ -27,10 +27,10 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)

 
 #ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>
 
 #ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>

+    #include <QuickTime/QuickTime.h>

 #else
     #include <PictUtils.h>
 #endif
 #else
     #include <PictUtils.h>
 #endif


@@ -47,8 +47,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 // under Quartz then content is transformed into a CGImageRef representing the same data
 // which can be transferred to the GPU by the OS for fast rendering
 
 // under Quartz then content is transformed into a CGImageRef representing the same data
 // which can be transferred to the GPU by the OS for fast rendering
 

-// we don't dare use premultiplied alpha yet
+#if wxMAC_USE_CORE_GRAPHICS
+    #define wxMAC_USE_PREMULTIPLIED_ALPHA 1
+    static const int kBestByteAlignement = 16;
+    static const int kMaskBytesPerPixel = 1;
+#else

 #define wxMAC_USE_PREMULTIPLIED_ALPHA 0
 #define wxMAC_USE_PREMULTIPLIED_ALPHA 0

+    static const int kBestByteAlignement = 4;
+    static const int kMaskBytesPerPixel = 4;
+#endif
+
+static int GetBestBytesPerRow( int rawBytes )
+{
+    return (((rawBytes)+kBestByteAlignement-1) & ~(kBestByteAlignement-1) );
+}

 
 #if wxUSE_BMPBUTTON
 
 
 #if wxUSE_BMPBUTTON
 


@@ -61,7 +73,22 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
         if ( bmap == NULL )
             return ;
 
         if ( bmap == NULL )
             return ;
 

-        if ( ( bmap->HasNativeSize() && forceType == 0 ) || forceType == kControlContentIconRef )
+        if ( forceType == 0  )
+        {
+            // NOTE : For testing Panther behaviour under higher
+            // Systems make this always be false
+            if ( UMAGetSystemVersion() >= 0x1040 )
+            {
+                // as soon as it is supported, it's a better default
+                forceType = kControlContentCGImageRef;
+            }
+            else if ( bmap->HasNativeSize() )
+            {
+                forceType = kControlContentIconRef;
+            }
+        }
+
+        if ( forceType == kControlContentIconRef )

         {
             wxBitmap scaleBmp ;
             wxBitmapRefData* bmp = bmap ;
         {
             wxBitmap scaleBmp ;
             wxBitmapRefData* bmp = bmap ;


@@ -85,21 +112,29 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
             info->u.iconRef = bmp->GetIconRef() ;
             AcquireIconRef( info->u.iconRef ) ;
         }
             info->u.iconRef = bmp->GetIconRef() ;
             AcquireIconRef( info->u.iconRef ) ;
         }

-#if defined( __WXMAC_OSX__ ) && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2

         else if ( forceType == kControlContentCGImageRef )
         {
             info->contentType = kControlContentCGImageRef ;
             info->u.imageRef = (CGImageRef) bmap->CGImageCreate() ;
         }
         else if ( forceType == kControlContentCGImageRef )
         {
             info->contentType = kControlContentCGImageRef ;
             info->u.imageRef = (CGImageRef) bmap->CGImageCreate() ;
         }

-#endif

         else
         {
         else
         {

+#ifndef __LP64__

             info->contentType = kControlContentPictHandle ;
             info->u.picture = bmap->GetPictHandle() ;
             info->contentType = kControlContentPictHandle ;
             info->u.picture = bmap->GetPictHandle() ;

+#endif

         }
     }
 }
 
         }
     }
 }
 

+CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap )
+{
+    wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
+    if ( bmap == NULL )
+        return NULL ;
+    return (CGImageRef) bmap->CGImageCreate();
+}
+

 void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
 {
     if ( info->contentType == kControlContentIconRef )
 void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
 {
     if ( info->contentType == kControlContentIconRef )


@@ -135,6 +170,7 @@ void wxBitmapRefData::Init()
     m_width = 0 ;
     m_height = 0 ;
     m_depth = 0 ;
     m_width = 0 ;
     m_height = 0 ;
     m_depth = 0 ;

+    m_bytesPerRow = 0;

     m_ok = false ;
     m_bitmapMask = NULL ;
 
     m_ok = false ;
     m_bitmapMask = NULL ;
 


@@ -145,13 +181,31 @@ void wxBitmapRefData::Init()
     m_iconRef = NULL ;
     m_pictHandle = NULL ;
     m_hBitmap = NULL ;
     m_iconRef = NULL ;
     m_pictHandle = NULL ;
     m_hBitmap = NULL ;

+#if! wxMAC_USE_CORE_GRAPHICS

     m_hMaskBitmap = NULL;
     m_maskBytesPerRow = 0 ;
     m_hMaskBitmap = NULL;
     m_maskBytesPerRow = 0 ;

+#endif

 
     m_rawAccessCount = 0 ;
     m_hasAlpha = false;
 }
 
 
     m_rawAccessCount = 0 ;
     m_hasAlpha = false;
 }
 

+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
+{
+    Init();
+    Create(tocopy.m_width, tocopy.m_height, tocopy.m_depth); 
+    
+    if (tocopy.m_bitmapMask)
+        m_bitmapMask = new wxMask(*tocopy.m_bitmapMask);
+    else if (tocopy.m_hasAlpha)
+        UseAlpha(true);
+
+    unsigned char* dest = (unsigned char*)GetRawAccess();
+    unsigned char* source = (unsigned char*)tocopy.GetRawAccess();
+    size_t numbytes = m_bytesPerRow * m_height;
+    memcpy( dest, source, numbytes );
+}
+

 wxBitmapRefData::wxBitmapRefData()
 {
     Init() ;
 wxBitmapRefData::wxBitmapRefData()
 {
     Init() ;


@@ -169,18 +223,24 @@ bool wxBitmapRefData::Create( int w , int h , int d )
     m_height = wxMax(1, h);
     m_depth = d ;
 
     m_height = wxMax(1, h);
     m_depth = d ;
 

-    m_bytesPerRow = w * 4 ;
+    m_bytesPerRow = GetBestBytesPerRow( w * 4 ) ;

     size_t size = m_bytesPerRow * h ;
     void* data = m_memBuf.GetWriteBuf( size ) ;
     memset( data , 0 , size ) ;
     m_memBuf.UngetWriteBuf( size ) ;
 
     m_hBitmap = NULL ;
     size_t size = m_bytesPerRow * h ;
     void* data = m_memBuf.GetWriteBuf( size ) ;
     memset( data , 0 , size ) ;
     m_memBuf.UngetWriteBuf( size ) ;
 
     m_hBitmap = NULL ;

+#if !wxMAC_USE_CORE_GRAPHICS

     Rect rect = { 0 , 0 , m_height , m_width } ;
     verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
         (char*) data , m_bytesPerRow ) ) ;
     wxASSERT_MSG( m_hBitmap , wxT("Unable to create GWorld context") ) ;
     Rect rect = { 0 , 0 , m_height , m_width } ;
     verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
         (char*) data , m_bytesPerRow ) ) ;
     wxASSERT_MSG( m_hBitmap , wxT("Unable to create GWorld context") ) ;

-
+#else
+    m_hBitmap = CGBitmapContextCreate((char*) data, m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), kCGImageAlphaNoneSkipFirst );
+    wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
+    CGContextTranslateCTM( m_hBitmap, 0,  m_height );
+    CGContextScaleCTM( m_hBitmap, 1, -1 );
+#endif

     m_ok = ( m_hBitmap != NULL ) ;
 
     return m_ok ;
     m_ok = ( m_hBitmap != NULL ) ;
 
     return m_ok ;


@@ -192,27 +252,35 @@ void wxBitmapRefData::UseAlpha( bool use )
         return ;
 
     m_hasAlpha = use ;
         return ;
 
     m_hasAlpha = use ;

+#if wxMAC_USE_CORE_GRAPHICS
+    CGContextRelease( m_hBitmap );
+    m_hBitmap = CGBitmapContextCreate((char*) m_memBuf.GetData(), m_width, m_height, 8, m_bytesPerRow, wxMacGetGenericRGBColorSpace(), m_hasAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst );
+    wxASSERT_MSG( m_hBitmap , wxT("Unable to create CGBitmapContext context") ) ;
+    CGContextTranslateCTM( m_hBitmap, 0,  m_height );
+    CGContextScaleCTM( m_hBitmap, 1, -1 );
+#else

     if ( m_hasAlpha )
     {
         wxASSERT( m_hMaskBitmap == NULL ) ;
 
         int width = GetWidth() ;
         int height = GetHeight() ;
     if ( m_hasAlpha )
     {
         wxASSERT( m_hMaskBitmap == NULL ) ;
 
         int width = GetWidth() ;
         int height = GetHeight() ;

-        m_maskBytesPerRow = ( width * 4 + 3 ) & 0xFFFFFFC ;
+        m_maskBytesPerRow = GetBestBytesPerRow( width * kMaskBytesPerPixel );

         size_t size = height * m_maskBytesPerRow ;
         unsigned char * data = (unsigned char * ) m_maskMemBuf.GetWriteBuf( size ) ;
         wxASSERT( data != NULL ) ;
 
         memset( data , 0 , size ) ;
         Rect rect = { 0 , 0 , height , width } ;
         size_t size = height * m_maskBytesPerRow ;
         unsigned char * data = (unsigned char * ) m_maskMemBuf.GetWriteBuf( size ) ;
         wxASSERT( data != NULL ) ;
 
         memset( data , 0 , size ) ;
         Rect rect = { 0 , 0 , height , width } ;

+

         verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
             (char*) data , m_maskBytesPerRow ) ) ;
         wxASSERT_MSG( m_hMaskBitmap , wxT("Unable to create GWorld context for alpha mask") ) ;
         verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
             (char*) data , m_maskBytesPerRow ) ) ;
         wxASSERT_MSG( m_hMaskBitmap , wxT("Unable to create GWorld context for alpha mask") ) ;

+

         m_maskMemBuf.UngetWriteBuf(size) ;
 
         m_maskMemBuf.UngetWriteBuf(size) ;
 

-#if !wxMAC_USE_CORE_GRAPHICS
+

         UpdateAlphaMask() ;
         UpdateAlphaMask() ;

-#endif

     }
     else
     {
     }
     else
     {


@@ -220,6 +288,7 @@ void wxBitmapRefData::UseAlpha( bool use )
         m_hMaskBitmap = NULL ;
         m_maskBytesPerRow = 0 ;
     }
         m_hMaskBitmap = NULL ;
         m_maskBytesPerRow = 0 ;
     }

+#endif

 }
 
 void *wxBitmapRefData::GetRawAccess() const
 }
 
 void *wxBitmapRefData::GetRawAccess() const


@@ -279,14 +348,16 @@ IconRef wxBitmapRefData::GetIconRef()
 
         IconFamilyHandle iconFamily = NULL ;
 
 
         IconFamilyHandle iconFamily = NULL ;
 

-#ifdef WORDS_BIGENDIAN
-        iconFamily = (IconFamilyHandle) NewHandle( 8 ) ;
-        (**iconFamily).resourceType = kIconFamilyType ;
-        (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
-#else
-        // test this solution on big endian as well
-        iconFamily = (IconFamilyHandle) NewHandle( 0 ) ;
-#endif
+        if ( UMAGetSystemVersion() < 0x1040 )
+        {
+            iconFamily = (IconFamilyHandle) NewHandle( 8 ) ;
+            (**iconFamily).resourceType = kIconFamilyType ;
+            (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
+        }
+        else
+        {
+            iconFamily = (IconFamilyHandle) NewHandle( 0 ) ;
+        }

 
         int w = GetWidth() ;
         int h = GetHeight() ;
 
         int w = GetWidth() ;
         int h = GetHeight() ;


@@ -298,23 +369,59 @@ IconRef wxBitmapRefData::GetIconRef()
         switch (sz)
         {
             case 128:
         switch (sz)
         {
             case 128:

-                dataType = kThumbnail32BitData ;
-                maskType = kThumbnail8BitMask ;
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( UMAGetSystemVersion() >= 0x1050 )
+                {
+                    dataType = kIconServices128PixelDataARGB ;
+                }
+                else
+#endif
+                {
+                    dataType = kThumbnail32BitData ;
+                    maskType = kThumbnail8BitMask ;
+                }

                 break;
 
             case 48:
                 break;
 
             case 48:

-                dataType = kHuge32BitData ;
-                maskType = kHuge8BitMask ;
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( UMAGetSystemVersion() >= 0x1050 )
+                {
+                    dataType = kIconServices48PixelDataARGB ;
+                }
+                else
+#endif
+                {
+                    dataType = kHuge32BitData ;
+                    maskType = kHuge8BitMask ;
+                }

                 break;
 
             case 32:
                 break;
 
             case 32:

-                dataType = kLarge32BitData ;
-                maskType = kLarge8BitMask ;
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( UMAGetSystemVersion() >= 0x1050 )
+                {
+                    dataType = kIconServices32PixelDataARGB ;
+                }
+                else
+#endif
+                {
+                    dataType = kLarge32BitData ;
+                    maskType = kLarge8BitMask ;
+                }

                 break;
 
             case 16:
                 break;
 
             case 16:

-                dataType = kSmall32BitData ;
-                maskType = kSmall8BitMask ;
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( UMAGetSystemVersion() >= 0x1050 )
+                {
+                    dataType = kIconServices16PixelDataARGB ;
+                }
+                else
+#endif
+                {
+                    dataType = kSmall32BitData ;
+                    maskType = kSmall8BitMask ;
+                }

                 break;
 
             default:
                 break;
 
             default:


@@ -323,73 +430,138 @@ IconRef wxBitmapRefData::GetIconRef()
 
         if ( dataType != 0 )
         {
 
         if ( dataType != 0 )
         {

-            // setup the header properly
-
-            Handle data = NULL ;
-            Handle maskdata = NULL ;
-            unsigned char * maskptr = NULL ;
-            unsigned char * ptr = NULL ;
-            size_t datasize, masksize ;
-
-            datasize = sz * sz * 4 ;
-            data = NewHandle( datasize ) ;
-            HLock( data ) ;
-            ptr = (unsigned char*) *data ;
-            memset( ptr , 0, datasize ) ;
-
-            masksize = sz * sz ;
-            maskdata = NewHandle( masksize ) ;
-            HLock( maskdata ) ;
-            maskptr = (unsigned char*) *maskdata ;
-            memset( maskptr , 0 , masksize ) ;
-
-            bool hasAlpha = HasAlpha() ;
-            wxMask *mask = m_bitmapMask ;
-            unsigned char * source = (unsigned char*) GetRawAccess() ;
-            unsigned char * masksource = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
-
-            for ( int y = 0 ; y < h ; ++y )
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+            if (  maskType == 0 && UMAGetSystemVersion() >= 0x1050 )

             {
             {

-                unsigned char * dest = ptr + y * sz * 4 ;
-                unsigned char * maskdest = maskptr + y * sz ;
-                unsigned char a, r, g, b;
-
-                for ( int x = 0 ; x < w ; ++x )
+                size_t datasize = sz * sz * 4 ;
+                Handle data = NewHandle( datasize ) ;
+                HLock( data ) ;
+                unsigned char* ptr = (unsigned char*) *data ;
+                memset( ptr, 0, datasize );
+                bool hasAlpha = HasAlpha() ;
+                wxMask *mask = m_bitmapMask ;
+                unsigned char * sourcePtr = (unsigned char*) GetRawAccess() ;
+                unsigned char * masksourcePtr = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
+
+                for ( int y = 0 ; y < h ; ++y, sourcePtr += m_bytesPerRow , masksourcePtr += mask ? mask->GetBytesPerRow() : 0 )

                 {
                 {

-                    a = *source ++ ;
-                    r = *source ++ ;
-                    g = *source ++ ;
-                    b = *source ++ ;
+                    unsigned char * source = sourcePtr;
+                    unsigned char * masksource = masksourcePtr;
+                    unsigned char * dest = ptr + y * sz * 4 ;
+                    unsigned char a, r, g, b;

 
 

-                    *dest++ = 0 ;
-                    *dest++ = r ;
-                    *dest++ = g ;
-                    *dest++ = b ;
+                    for ( int x = 0 ; x < w ; ++x )
+                    {
+                        a = *source ++ ;
+                        r = *source ++ ;
+                        g = *source ++ ;
+                        b = *source ++ ;
+
+                        if ( mask )
+                        {
+                            a = 0xFF - *masksource++ ;
+                        }
+                        else if ( !hasAlpha )
+                            a = 0xFF ;
+                        else
+                        {
+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+                            // this must be non-premultiplied data
+                            if ( a != 0xFF && a!= 0 )
+                            {
+                                r = r * 255 / a;
+                                g = g * 255 / a;
+                                b = b * 255 / a;
+                            }
+#endif
+                        }
+                        *dest++ = a ;
+                        *dest++ = r ;
+                        *dest++ = g ;
+                        *dest++ = b ;

 
 

-                    if ( mask )
+                     }
+                }
+                HUnlock( data );
+                OSStatus err = SetIconFamilyData( iconFamily, dataType , data );
+                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") );
+                DisposeHandle( data );
+            }
+            else
+#endif
+            {
+                // setup the header properly
+                
+                Handle data = NULL ;
+                Handle maskdata = NULL ;
+                unsigned char * maskptr = NULL ;
+                unsigned char * ptr = NULL ;
+                size_t datasize, masksize ;
+                
+                datasize = sz * sz * 4 ;
+                data = NewHandle( datasize ) ;
+                HLock( data ) ;
+                ptr = (unsigned char*) *data ;
+                memset( ptr , 0, datasize ) ;
+                
+                masksize = sz * sz ;
+                maskdata = NewHandle( masksize ) ;
+                HLock( maskdata ) ;
+                maskptr = (unsigned char*) *maskdata ;
+                memset( maskptr , 0 , masksize ) ;
+                
+                bool hasAlpha = HasAlpha() ;
+                wxMask *mask = m_bitmapMask ;
+                unsigned char * sourcePtr = (unsigned char*) GetRawAccess() ;
+                unsigned char * masksourcePtr = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
+                
+                for ( int y = 0 ; y < h ; ++y, sourcePtr += m_bytesPerRow , masksourcePtr += mask ? mask->GetBytesPerRow() : 0 )
+                {
+                    unsigned char * source = sourcePtr;
+                    unsigned char * masksource = masksourcePtr;
+                    unsigned char * dest = ptr + y * sz * 4 ;
+                    unsigned char * maskdest = maskptr + y * sz ;
+                    unsigned char a, r, g, b;
+                    
+                    for ( int x = 0 ; x < w ; ++x )

                     {
                     {

-                        *maskdest++ = 0xFF - *masksource++ ;
-                        masksource++ ;
-                        masksource++ ;
-                        masksource++ ;
+                        a = *source ++ ;
+                        r = *source ++ ;
+                        g = *source ++ ;
+                        b = *source ++ ;
+                        
+                        *dest++ = 0 ;
+                        *dest++ = r ;
+                        *dest++ = g ;
+                        *dest++ = b ;
+                        
+                        if ( mask )
+                        {
+                            *maskdest++ = 0xFF - *masksource++ ;
+#if !wxMAC_USE_CORE_GRAPHICS
+                            masksource++ ;
+                            masksource++ ;
+                            masksource++ ;
+#endif
+                        }
+                        else if ( hasAlpha )
+                            *maskdest++ = a ;
+                        else
+                            *maskdest++ = 0xFF ;

                     }
                     }

-                    else if ( hasAlpha )
-                        *maskdest++ = a ;
-                    else
-                        *maskdest++ = 0xFF ;

                 }
                 }

+                
+                OSStatus err = SetIconFamilyData( iconFamily, dataType , data ) ;
+                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
+                
+                err = SetIconFamilyData( iconFamily, maskType , maskdata ) ;
+                wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ;
+                
+                HUnlock( data ) ;
+                HUnlock( maskdata ) ;
+                DisposeHandle( data ) ;
+                DisposeHandle( maskdata ) ;

             }
             }

-
-            OSStatus err = SetIconFamilyData( iconFamily, dataType , data ) ;
-            wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-
-            err = SetIconFamilyData( iconFamily, maskType , maskdata ) ;
-            wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ;
-
-            HUnlock( data ) ;
-            HUnlock( maskdata ) ;
-            DisposeHandle( data ) ;
-            DisposeHandle( maskdata ) ;

         }
         else
         {
         }
         else
         {


@@ -397,23 +569,12 @@ IconRef wxBitmapRefData::GetIconRef()
             SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
         }
         // transform into IconRef
             SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
         }
         // 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") );
         // 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 ) ;
-        wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-
-        // we have to retain a reference, as Unregister will decrement it
-        AcquireIconRef( m_iconRef ) ;
-        UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;
-        ++iconCounter ;
-#endif

         DisposeHandle( (Handle) iconFamily ) ;
     }
 
         DisposeHandle( (Handle) iconFamily ) ;
     }
 


@@ -424,6 +585,7 @@ PicHandle wxBitmapRefData::GetPictHandle()
 {
     if ( m_pictHandle == NULL )
     {
 {
     if ( m_pictHandle == NULL )
     {

+#if !wxMAC_USE_CORE_GRAPHICS

         CGrafPtr origPort = NULL ;
         GDHandle origDev = NULL ;
         GWorldPtr wp = NULL ;
         CGrafPtr origPort = NULL ;
         GDHandle origDev = NULL ;
         GWorldPtr wp = NULL ;


@@ -493,13 +655,42 @@ PicHandle wxBitmapRefData::GetPictHandle()
         SetGWorld( origPort , origDev ) ;
         if ( clipRgn )
             DisposeRgn( clipRgn ) ;
         SetGWorld( origPort , origDev ) ;
         if ( clipRgn )
             DisposeRgn( clipRgn ) ;

+#else
+#ifndef __LP64__
+        GraphicsExportComponent exporter = 0;
+        OSStatus err = OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypePicture, &exporter);
+        if (noErr == err)
+        {
+            m_pictHandle = (PicHandle) NewHandle(0);
+            if ( m_pictHandle )
+            {
+                // QT does not correctly export the mask
+                // TODO if we get around to it create a synthetic PICT with the CopyBits and Mask commands
+                CGImageRef imageRef = CGImageCreate();
+                err = GraphicsExportSetInputCGImage( exporter, imageRef );
+                err = GraphicsExportSetOutputHandle(exporter, (Handle)m_pictHandle);
+                err = GraphicsExportDoExport(exporter, NULL);
+                CGImageRelease( imageRef );
+
+                               size_t handleSize = GetHandleSize( (Handle) m_pictHandle );
+                               // the 512 bytes header is only needed for pict files, but not in memory
+                               if ( handleSize >= 512 )
+                               {
+                                       memmove( *m_pictHandle , (char*)(*m_pictHandle)+512, handleSize - 512 );
+                                       SetHandleSize( (Handle) m_pictHandle, handleSize - 512 );
+                               }
+            }
+            CloseComponent( exporter );
+        }
+#endif
+#endif

     }
 
     return m_pictHandle ;
 }
 
 #ifdef __WXMAC_OSX__
     }
 
     return m_pictHandle ;
 }
 
 #ifdef __WXMAC_OSX__

-void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size)
+void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t WXUNUSED(size))

 {
     wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
 
 {
     wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
 


@@ -515,54 +706,95 @@ CGImageRef wxBitmapRefData::CGImageCreate() const
     CGImageRef image ;
     if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
     {
     CGImageRef image ;
     if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
     {

-        size_t imageSize = m_width * m_height * 4 ;
-        void * dataBuffer = m_memBuf.GetData() ;
-        int w = m_width ;
-        int h = m_height ;
-        CGImageAlphaInfo alphaInfo = kCGImageAlphaNoneSkipFirst ;
-        wxMemoryBuffer* membuf = NULL ;
-
-        if ( m_bitmapMask )
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) && wxMAC_USE_CORE_GRAPHICS
+        if ( UMAGetSystemVersion() >= 0x1040 && m_depth != 1 && m_bitmapMask == NULL )

         {
         {

-            alphaInfo = kCGImageAlphaFirst ;
-            membuf = new wxMemoryBuffer( imageSize ) ;
-            memcpy( membuf->GetData() , dataBuffer , imageSize ) ;
-            unsigned char *sourcemaskstart = (unsigned char *) m_bitmapMask->GetRawAccess() ;
-            int maskrowbytes = m_bitmapMask->GetBytesPerRow() ;
-            unsigned char *destalpha = (unsigned char *) membuf->GetData() ;
-            for ( int y = 0 ; y < h ; ++y , sourcemaskstart += maskrowbytes)
+            if ( m_bitmapMask )

             {
             {

-                unsigned char *sourcemask = sourcemaskstart ;
-                for ( int x = 0 ; x < w ; ++x , sourcemask += 4 , destalpha += 4 )
-                {
-                    *destalpha = 0xFF - *sourcemask ;
-                }
+                CGImageRef tempImage = CGBitmapContextCreateImage( m_hBitmap );
+                CGImageRef tempMask = CGBitmapContextCreateImage((CGContextRef) m_bitmapMask->GetHBITMAP() );
+                image = CGImageCreateWithMask( tempImage, tempMask );
+                CGImageRelease(tempMask);
+                CGImageRelease(tempImage);

             }
             }

+            else
+                image = CGBitmapContextCreateImage( m_hBitmap );

         }
         else
         }
         else

+#endif

         {
         {

-            if ( m_hasAlpha )
+            size_t imageSize = m_height * m_bytesPerRow ;
+            void * dataBuffer = m_memBuf.GetData() ;
+            int w = m_width ;
+            int h = m_height ;
+            CGImageAlphaInfo alphaInfo = kCGImageAlphaNoneSkipFirst ;
+            wxMemoryBuffer* membuf = NULL ;
+            
+            if ( m_bitmapMask )

             {
             {

+                alphaInfo = kCGImageAlphaFirst ;
+                membuf = new wxMemoryBuffer( imageSize ) ;
+                memcpy( membuf->GetData() , dataBuffer , imageSize ) ;
+                unsigned char *sourcemaskstart = (unsigned char *) m_bitmapMask->GetRawAccess() ;
+                int maskrowbytes = m_bitmapMask->GetBytesPerRow() ;
+                unsigned char *destalphastart = (unsigned char *) membuf->GetData() ;
+                for ( int y = 0 ; y < h ; ++y , destalphastart += m_bytesPerRow, sourcemaskstart += maskrowbytes)
+                {
+                    unsigned char *sourcemask = sourcemaskstart ;
+                    unsigned char *destalpha = destalphastart ;
+                    for ( int x = 0 ; x < w ; ++x , sourcemask += kMaskBytesPerPixel , destalpha += 4 )
+                    {
+                        *destalpha = 0xFF - *sourcemask ;
+                    }
+                }
+            }
+            else
+            {
+                if ( m_hasAlpha )
+                {

 #if wxMAC_USE_PREMULTIPLIED_ALPHA
 #if wxMAC_USE_PREMULTIPLIED_ALPHA

-                alphaInfo = kCGImageAlphaPremultipliedFirst ;
+                    alphaInfo = kCGImageAlphaPremultipliedFirst ;

 #else
 #else

-                alphaInfo = kCGImageAlphaFirst ;
+                    alphaInfo = kCGImageAlphaFirst ;

 #endif
 #endif

+                }
+                
+                membuf = new wxMemoryBuffer( m_memBuf ) ;

             }
             }

-
-            membuf = new wxMemoryBuffer( m_memBuf ) ;
+            
+            CGDataProviderRef dataProvider = NULL ;
+            if ( m_depth == 1 )
+            {
+                wxMemoryBuffer* maskBuf = new wxMemoryBuffer( m_width * m_height );
+                unsigned char * maskBufData = (unsigned char *) maskBuf->GetData();
+                unsigned char * bufData = (unsigned char *) membuf->GetData() ;
+                // copy one color component
+                for( int i = 0 ; i < m_width * m_height ; ++i )
+                    maskBufData[i] = bufData[i*4+3];
+                dataProvider =
+                    CGDataProviderCreateWithData(
+                                                 maskBuf , (const void *) maskBufData , m_width * m_height,
+                                                 wxMacMemoryBufferReleaseProc );
+                // as we are now passing the mask buffer to the data provider, we have
+                // to release the membuf ourselves
+                delete membuf ;
+                
+                image = ::CGImageMaskCreate( w, h, 8, 8, m_width , dataProvider, NULL, false );
+            }
+            else
+            {
+                CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
+                dataProvider =
+                    CGDataProviderCreateWithData(
+                                                 membuf , (const void *)membuf->GetData() , imageSize,
+                                                 wxMacMemoryBufferReleaseProc );
+                image =
+                    ::CGImageCreate(
+                                    w, h, 8 , 32 , m_bytesPerRow , colorSpace, alphaInfo ,
+                                    dataProvider, NULL , false , kCGRenderingIntentDefault );
+            }
+            CGDataProviderRelease( dataProvider);

         }
         }

-
-        CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
-        CGDataProviderRef dataProvider =
-            CGDataProviderCreateWithData(
-                membuf , (const void *)membuf->GetData() , imageSize,
-                wxMacMemoryBufferReleaseProc );
-        image =
-            ::CGImageCreate(
-                w, h, 8 , 32 , 4 * m_width , colorSpace, alphaInfo ,
-                dataProvider, NULL , false , kCGRenderingIntentDefault );
-        CGDataProviderRelease( dataProvider);

     }
     else
     {
     }
     else
     {


@@ -581,6 +813,12 @@ CGImageRef wxBitmapRefData::CGImageCreate() const
 }
 #endif
 
 }
 #endif
 

+#if wxMAC_USE_CORE_GRAPHICS 
+CGContextRef wxBitmapRefData::GetBitmapContext() const
+{
+    return m_hBitmap;
+}
+#else

 GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );


@@ -593,22 +831,17 @@ GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const
         }
         else if ( m_hasAlpha )
         {
         }
         else if ( m_hasAlpha )
         {

-#if !wxMAC_USE_CORE_GRAPHICS

             if ( m_rawAccessCount > 0 )
                 UpdateAlphaMask() ;
             if ( m_rawAccessCount > 0 )
                 UpdateAlphaMask() ;

-#else
-            // this structure is not kept in synch when using CG, so if something
-            // is really accessing the GrafPorts, we have to sync it
-            UpdateAlphaMask() ;
-#endif
-

             *mask = m_hMaskBitmap ;
         }
     }
 
     return m_hBitmap ;
 }
             *mask = m_hMaskBitmap ;
         }
     }
 
     return m_hBitmap ;
 }

+#endif

 
 

+#if !wxMAC_USE_CORE_GRAPHICS 

 void wxBitmapRefData::UpdateAlphaMask() const
 {
     if ( m_hasAlpha )
 void wxBitmapRefData::UpdateAlphaMask() const
 {
     if ( m_hasAlpha )


@@ -634,6 +867,7 @@ void wxBitmapRefData::UpdateAlphaMask() const
         }
     }
 }
         }
     }
 }

+#endif

 
 void wxBitmapRefData::Free()
 {
 
 void wxBitmapRefData::Free()
 {


@@ -653,24 +887,31 @@ void wxBitmapRefData::Free()
         m_iconRef = NULL ;
     }
 
         m_iconRef = NULL ;
     }
 

+#ifndef __LP64__

     if ( m_pictHandle )
     {
         KillPicture( m_pictHandle ) ;
         m_pictHandle = NULL ;
     }
     if ( m_pictHandle )
     {
         KillPicture( m_pictHandle ) ;
         m_pictHandle = NULL ;
     }

+#endif

 
     if ( m_hBitmap )
     {
 
     if ( m_hBitmap )
     {

+#if !wxMAC_USE_CORE_GRAPHICS

         DisposeGWorld( MAC_WXHBITMAP(m_hBitmap) ) ;
         DisposeGWorld( MAC_WXHBITMAP(m_hBitmap) ) ;

+#else
+        CGContextRelease(m_hBitmap);
+#endif

         m_hBitmap = NULL ;
     }
 
         m_hBitmap = NULL ;
     }
 

+#if !wxMAC_USE_CORE_GRAPHICS

     if ( m_hMaskBitmap )
     {
         DisposeGWorld( MAC_WXHBITMAP(m_hMaskBitmap) ) ;
         m_hMaskBitmap = NULL ;
     }
     if ( m_hMaskBitmap )
     {
         DisposeGWorld( MAC_WXHBITMAP(m_hMaskBitmap) ) ;
         m_hMaskBitmap = NULL ;
     }

-
+#endif

     if (m_bitmapMask)
     {
         delete m_bitmapMask;
     if (m_bitmapMask)
     {
         delete m_bitmapMask;


@@ -753,11 +994,18 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
             {
                 for ( int x = 0 ; x < w ; ++x )
                 {
             {
                 for ( int x = 0 ; x < w ; ++x )
                 {

-                    *destination++ = *sourcemask++ ;
+                    unsigned char a = *sourcemask++;
+                    *destination++ = a;

                     source++ ;
                     source++ ;

+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+                    *destination++ = ( (*source++) * a + 127 ) / 255;
+                    *destination++ = ( (*source++) * a + 127 ) / 255;
+                    *destination++ = ( (*source++) * a + 127 ) / 255;
+#else                    

                     *destination++ = *source++ ;
                     *destination++ = *source++ ;
                     *destination++ = *source++ ;
                     *destination++ = *source++ ;
                     *destination++ = *source++ ;
                     *destination++ = *source++ ;

+#endif

                 }
             }
 
                 }
             }
 


@@ -800,10 +1048,11 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
             linesize += sizeof(unsigned char);
 
         unsigned char* linestart = (unsigned char*) bits ;
             linesize += sizeof(unsigned char);
 
         unsigned char* linestart = (unsigned char*) bits ;

-        unsigned char* destination = (unsigned char*) BeginRawAccess() ;
+        unsigned char* destptr = (unsigned char*) BeginRawAccess() ;

 
 

-        for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
+        for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() )

         {
         {

+            unsigned char* destination = destptr;

             int index, bit, mask;
 
             for ( int x = 0 ; x < the_width ; ++x )
             int index, bit, mask;
 
             for ( int x = 0 ; x < the_width ; ++x )


@@ -812,7 +1061,7 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
                 bit = x % 8 ;
                 mask = 1 << bit ;
 
                 bit = x % 8 ;
                 mask = 1 << bit ;
 

-                if ( !(linestart[index] & mask ) )
+                if ( linestart[index] & mask )

                 {
                     *destination++ = 0xFF ;
                     *destination++ = 0 ;
                 {
                     *destination++ = 0xFF ;
                     *destination++ = 0 ;


@@ -842,7 +1091,7 @@ wxBitmap::wxBitmap(int w, int h, int d)
     (void)Create(w, h, d);
 }
 
     (void)Create(w, h, d);
 }
 

-wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
+wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     (void) Create(data, type, width, height, depth);
 }
 {
     (void) Create(data, type, width, height, depth);
 }


@@ -852,14 +1101,14 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, type);
 }
 
     LoadFile(filename, type);
 }
 

-wxBitmap::wxBitmap(const char **bits)
+wxObjectRefData* wxBitmap::CreateRefData() const

 {
 {

-    (void) CreateFromXpm(bits);
+    return new wxBitmapRefData;

 }
 
 }
 

-wxBitmap::wxBitmap(char **bits)
+wxObjectRefData* wxBitmap::CloneRefData(const wxObjectRefData* data) const

 {
 {

-    (void) CreateFromXpm((const char **)bits);
+    return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));

 }
 
 void * wxBitmap::GetRawAccess() const
 }
 
 void * wxBitmap::GetRawAccess() const


@@ -883,24 +1132,6 @@ void wxBitmap::EndRawAccess()
     M_BITMAPDATA->EndRawAccess() ;
 }
 
     M_BITMAPDATA->EndRawAccess() ;
 }
 

-bool wxBitmap::CreateFromXpm(const char **bits)
-{
-#if wxUSE_IMAGE
-    wxCHECK_MSG( bits != NULL, false, wxT("invalid bitmap data") );
-
-    wxXPMDecoder decoder;
-    wxImage img = decoder.ReadData(bits);
-    wxCHECK_MSG( img.Ok(), false, wxT("invalid bitmap data") );
-
-    *this = wxBitmap(img);
-
-    return true;
-#else
-
-    return false;
-#endif
-}
-

 #ifdef __WXMAC_OSX__
 WXCGIMAGEREF wxBitmap::CGImageCreate() const
 {
 #ifdef __WXMAC_OSX__
 WXCGIMAGEREF wxBitmap::CGImageCreate() const
 {


@@ -921,7 +1152,6 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
     wxBitmap ret( rect.width, rect.height, GetDepth() );
     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
     wxBitmap ret( rect.width, rect.height, GetDepth() );
     wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 

-    int sourcewidth = GetWidth() ;

     int destwidth = rect.width ;
     int destheight = rect.height ;
 
     int destwidth = rect.width ;
     int destheight = rect.height ;
 


@@ -930,8 +1160,8 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
         unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ;
         wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ;
 
         unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ;
         wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ;
 

-        int sourcelinesize = sourcewidth * 4 ;
-        int destlinesize = destwidth * 4 ;
+        int sourcelinesize = GetBitmapData()->GetBytesPerRow() ;
+        int destlinesize = ret.GetBitmapData()->GetBytesPerRow() ;

         unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ;
         unsigned char *dest = destdata ;
 
         unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ;
         unsigned char *dest = destdata ;
 


@@ -946,7 +1176,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
     if ( M_BITMAPDATA->m_bitmapMask )
     {
         wxMemoryBuffer maskbuf ;
     if ( M_BITMAPDATA->m_bitmapMask )
     {
         wxMemoryBuffer maskbuf ;

-        int rowBytes = ( destwidth * 4 + 3 ) & 0xFFFFFFC ;
+        int rowBytes = GetBestBytesPerRow( destwidth * kMaskBytesPerPixel );

         size_t maskbufsize = rowBytes * destheight ;
 
         int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ;
         size_t maskbufsize = rowBytes * destheight ;
 
         int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ;


@@ -956,7 +1186,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
         unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ;
         wxASSERT( (source != NULL) && (destdata != NULL) ) ;
 
         unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ;
         wxASSERT( (source != NULL) && (destdata != NULL) ) ;
 

-        source += rect.x * 4 + rect.y * sourcelinesize ;
+        source += rect.x * kMaskBytesPerPixel + rect.y * sourcelinesize ;

         unsigned char *dest = destdata ;
 
         for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
         unsigned char *dest = destdata ;
 
         for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)


@@ -1015,7 +1245,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     return false;
 }
 
     return false;
 }
 

-bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int depth)
+bool wxBitmap::Create(const void* data, wxBitmapType type, int width, int height, int depth)

 {
     UnRef();
 
 {
     UnRef();
 


@@ -1038,17 +1268,17 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
     wxCHECK_RET( image.Ok(), wxT("invalid image") );
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
     wxCHECK_RET( image.Ok(), wxT("invalid image") );

-
+    

     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();

-
+    

     m_refData = new wxBitmapRefData( width , height , depth ) ;
     m_refData = new wxBitmapRefData( width , height , depth ) ;

-
+    

     // Create picture
     // Create picture

-
+    

     bool hasAlpha = false ;
     bool hasAlpha = false ;

-
+    

     if ( image.HasMask() )
     {
         // takes precedence, don't mix with alpha info
     if ( image.HasMask() )
     {
         // takes precedence, don't mix with alpha info


@@ -1057,44 +1287,47 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
     {
         hasAlpha = image.HasAlpha() ;
     }
     {
         hasAlpha = image.HasAlpha() ;
     }

-
+    

     if ( hasAlpha )
         UseAlpha() ;
     if ( hasAlpha )
         UseAlpha() ;

-
-    unsigned char* destination = (unsigned char*) BeginRawAccess() ;
+    
+    unsigned char* destinationstart = (unsigned char*) BeginRawAccess() ;

     register unsigned char* data = image.GetData();
     register unsigned char* data = image.GetData();

-    const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
-
-    for (int y = 0; y < height; y++)
+    if ( destinationstart != NULL && data != NULL )

     {
     {

-        for (int x = 0; x < width; x++)
+        const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
+        for (int y = 0; y < height; destinationstart += M_BITMAPDATA->GetBytesPerRow(), y++)

         {
         {

-            if ( hasAlpha )
+            unsigned char * destination = destinationstart;
+            for (int x = 0; x < width; x++)

             {
             {

-                const unsigned char a = *alpha++;
-                *destination++ = a ;
-
+                if ( hasAlpha )
+                {
+                    const unsigned char a = *alpha++;
+                    *destination++ = a ;
+                    

 #if wxMAC_USE_PREMULTIPLIED_ALPHA
 #if wxMAC_USE_PREMULTIPLIED_ALPHA

-                *destination++ = ((*data++) * a + 127) / 255 ;
-                *destination++ = ((*data++) * a + 127) / 255 ;
-                *destination++ = ((*data++) * a + 127) / 255 ;
+                    *destination++ = ((*data++) * a + 127) / 255 ;
+                    *destination++ = ((*data++) * a + 127) / 255 ;
+                    *destination++ = ((*data++) * a + 127) / 255 ;

 #else
 #else

-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
+                    *destination++ = *data++ ;
+                    *destination++ = *data++ ;
+                    *destination++ = *data++ ;

 #endif
 #endif

-            }
-            else
-            {
-                *destination++ = 0xFF ;
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
+                }
+                else
+                {
+                    *destination++ = 0xFF ;
+                    *destination++ = *data++ ;
+                    *destination++ = *data++ ;
+                    *destination++ = *data++ ;
+                }

             }
         }
             }
         }

+        
+        EndRawAccess() ;

     }
     }

-
-    EndRawAccess() ;

     if ( image.HasMask() )
         SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
 }
     if ( image.HasMask() )
         SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
 }


@@ -1113,7 +1346,7 @@ wxImage wxBitmap::ConvertToImage() const
     unsigned char *data = image.GetData();
     wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
 
     unsigned char *data = image.GetData();
     wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
 

-    unsigned char* source = (unsigned char*) GetRawAccess() ;
+    unsigned char* sourcestart = (unsigned char*) GetRawAccess() ;

 
     bool hasAlpha = false ;
     bool hasMask = false ;
 
     bool hasAlpha = false ;
     bool hasMask = false ;


@@ -1147,9 +1380,10 @@ wxImage wxBitmap::ConvertToImage() const
     static const int MASK_BLUE = 3;
     static const int MASK_BLUE_REPLACEMENT = 2;
 
     static const int MASK_BLUE = 3;
     static const int MASK_BLUE_REPLACEMENT = 2;
 

-    for (int yy = 0; yy < height; yy++ , mask += maskBytesPerRow )
+    for (int yy = 0; yy < height; yy++ , sourcestart += M_BITMAPDATA->GetBytesPerRow() , mask += maskBytesPerRow )

     {
         unsigned char * maskp = mask ;
     {
         unsigned char * maskp = mask ;

+        unsigned char * source = sourcestart;

         unsigned char a, r, g, b;
         long color;
 
         unsigned char a, r, g, b;
         long color;
 


@@ -1177,13 +1411,25 @@ wxImage wxBitmap::ConvertToImage() const
                 }
                 else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
                     b = MASK_BLUE_REPLACEMENT ;
                 }
                 else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
                     b = MASK_BLUE_REPLACEMENT ;

-
+#if !wxMAC_USE_CORE_GRAPHICS

                 maskp++ ;
                 maskp++ ;
                 maskp++ ;
                 maskp++ ;
                 maskp++ ;
                 maskp++ ;

+#endif

             }
             else if ( hasAlpha )
             }
             else if ( hasAlpha )

+            {

                 *alpha++ = a ;
                 *alpha++ = a ;

+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+                // this must be non-premultiplied data
+                if ( a != 0xFF && a!= 0 )
+                {
+                    r = r * 255 / a;
+                    g = g * 255 / a;
+                    b = b * 255 / a;
+                }
+#endif
+            }

 
             data[index    ] = r ;
             data[index + 1] = g ;
 
             data[index    ] = r ;
             data[index + 1] = g ;


@@ -1225,7 +1471,7 @@ bool wxBitmap::SaveFile( const wxString& filename,
     return success;
 }
 
     return success;
 }
 

-bool wxBitmap::Ok() const
+bool wxBitmap::IsOk() const

 {
    return (M_BITMAPDATA && M_BITMAPDATA->Ok());
 }
 {
    return (M_BITMAPDATA && M_BITMAPDATA->Ok());
 }


@@ -1251,17 +1497,6 @@ int wxBitmap::GetDepth() const
    return M_BITMAPDATA->GetDepth();
 }
 
    return M_BITMAPDATA->GetDepth();
 }
 

-#if WXWIN_COMPATIBILITY_2_4
-int wxBitmap::GetQuality() const
-{
-    return 0;
-}
-
-void wxBitmap::SetQuality(int WXUNUSED(quality))
-{
-}
-#endif
-

 wxMask *wxBitmap::GetMask() const
 {
    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
 wxMask *wxBitmap::GetMask() const
 {
    wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );


@@ -1278,33 +1513,25 @@ bool wxBitmap::HasAlpha() const
 
 void wxBitmap::SetWidth(int w)
 {
 
 void wxBitmap::SetWidth(int w)
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();

     M_BITMAPDATA->SetWidth(w);
 }
 
 void wxBitmap::SetHeight(int h)
 {
     M_BITMAPDATA->SetWidth(w);
 }
 
 void wxBitmap::SetHeight(int h)
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();

     M_BITMAPDATA->SetHeight(h);
 }
 
 void wxBitmap::SetDepth(int d)
 {
     M_BITMAPDATA->SetHeight(h);
 }
 
 void wxBitmap::SetDepth(int d)
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();

     M_BITMAPDATA->SetDepth(d);
 }
 
 void wxBitmap::SetOk(bool isOk)
 {
     M_BITMAPDATA->SetDepth(d);
 }
 
 void wxBitmap::SetOk(bool isOk)
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();

     M_BITMAPDATA->SetOk(isOk);
 }
 
     M_BITMAPDATA->SetOk(isOk);
 }
 


@@ -1318,18 +1545,14 @@ wxPalette *wxBitmap::GetPalette() const
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();

     M_BITMAPDATA->m_bitmapPalette = palette ;
 }
 #endif // wxUSE_PALETTE
 
 void wxBitmap::SetMask(wxMask *mask)
 {
     M_BITMAPDATA->m_bitmapPalette = palette ;
 }
 #endif // wxUSE_PALETTE
 
 void wxBitmap::SetMask(wxMask *mask)
 {

-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();

     // Remove existing mask if there is one.
     delete M_BITMAPDATA->m_bitmapMask;
 
     // Remove existing mask if there is one.
     delete M_BITMAPDATA->m_bitmapMask;
 


@@ -1338,7 +1561,11 @@ void wxBitmap::SetMask(wxMask *mask)
 
 WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
 {
 
 WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
 {

+#if !wxMAC_USE_CORE_GRAPHICS

     return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((GWorldPtr*)mask));
     return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((GWorldPtr*)mask));

+#else
+    return WXHBITMAP(M_BITMAPDATA->GetBitmapContext());
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1350,6 +1577,22 @@ wxMask::wxMask()
     Init() ;
 }
 
     Init() ;
 }
 

+wxMask::wxMask(const wxMask &tocopy)
+{
+    Init();
+
+    m_bytesPerRow = tocopy.m_bytesPerRow;
+    m_width = tocopy.m_width;
+    m_height = tocopy.m_height;
+
+    size_t size = m_bytesPerRow * m_height;
+    unsigned char* dest = (unsigned char*)m_memBuf.GetWriteBuf( size );
+    unsigned char* source = (unsigned char*)tocopy.m_memBuf.GetData();
+    memcpy( dest, source, size );
+    m_memBuf.UngetWriteBuf( size ) ;
+    RealizeNative() ;
+}
+

 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )


@@ -1377,7 +1620,11 @@ wxMask::~wxMask()
 {
     if ( m_maskBitmap )
     {
 {
     if ( m_maskBitmap )
     {

+#if wxMAC_USE_CORE_GRAPHICS
+        CGContextRelease( (CGContextRef) m_maskBitmap );
+#else

         DisposeGWorld( (GWorldPtr)m_maskBitmap ) ;
         DisposeGWorld( (GWorldPtr)m_maskBitmap ) ;

+#endif

         m_maskBitmap = NULL ;
     }
 }
         m_maskBitmap = NULL ;
     }
 }


@@ -1400,16 +1647,32 @@ void wxMask::RealizeNative()
 {
     if ( m_maskBitmap )
     {
 {
     if ( m_maskBitmap )
     {

+#if wxMAC_USE_CORE_GRAPHICS
+        CGContextRelease( (CGContextRef) m_maskBitmap );
+#else

        DisposeGWorld( (GWorldPtr)m_maskBitmap ) ;
        DisposeGWorld( (GWorldPtr)m_maskBitmap ) ;

+#endif

        m_maskBitmap = NULL ;
     }
 
        m_maskBitmap = NULL ;
     }
 

+#if wxMAC_USE_CORE_GRAPHICS
+    CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceGray();
+    // from MouseTracking sample :
+    // Ironically, due to a bug in CGImageCreateWithMask, you cannot use 
+    // CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) at this point!
+    
+    m_maskBitmap = CGBitmapContextCreate((char*) m_memBuf.GetData(), m_width, m_height, 8, m_bytesPerRow, colorspace, 
+        kCGImageAlphaNone );
+    CGColorSpaceRelease( colorspace );
+    wxASSERT_MSG( m_maskBitmap , wxT("Unable to create CGBitmapContext context") ) ;
+#else

     Rect rect = { 0 , 0 , m_height , m_width } ;
 
     OSStatus err = NewGWorldFromPtr(
         (GWorldPtr*) &m_maskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
         (char*) m_memBuf.GetData() , m_bytesPerRow ) ;
     verify_noerr( err ) ;
     Rect rect = { 0 , 0 , m_height , m_width } ;
 
     OSStatus err = NewGWorldFromPtr(
         (GWorldPtr*) &m_maskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
         (char*) m_memBuf.GetData() , m_bytesPerRow ) ;
     verify_noerr( err ) ;

+#endif

 }
 
 // Create a mask from a mono bitmap (copies the bitmap).
 }
 
 // Create a mask from a mono bitmap (copies the bitmap).


@@ -1433,7 +1696,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
 {
     m_width = bitmap.GetWidth() ;
     m_height = bitmap.GetHeight() ;
 {
     m_width = bitmap.GetWidth() ;
     m_height = bitmap.GetHeight() ;

-    m_bytesPerRow = ( m_width * 4 + 3 ) & 0xFFFFFFC ;
+    m_bytesPerRow = GetBestBytesPerRow( m_width * kMaskBytesPerPixel ) ;

 
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
 
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;


@@ -1457,16 +1720,20 @@ bool wxMask::Create(const wxBitmap& bitmap)
             if ( ( r + g + b ) > 0x10 )
             {
                 *destdata++ = 0xFF ;
             if ( ( r + g + b ) > 0x10 )
             {
                 *destdata++ = 0xFF ;

+#if !wxMAC_USE_CORE_GRAPHICS

                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;

+#endif

             }
             else
             {
                 *destdata++ = 0x00 ;
             }
             else
             {
                 *destdata++ = 0x00 ;

+#if !wxMAC_USE_CORE_GRAPHICS

                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;

+#endif

             }
         }
     }
             }
         }
     }


@@ -1483,17 +1750,19 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
     m_width = bitmap.GetWidth() ;
     m_height = bitmap.GetHeight() ;
 {
     m_width = bitmap.GetWidth() ;
     m_height = bitmap.GetHeight() ;

-    m_bytesPerRow = ( m_width * 4 + 3 ) & 0xFFFFFFC ;
+    m_bytesPerRow = GetBestBytesPerRow( m_width * kMaskBytesPerPixel ) ;

 
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
     wxASSERT( destdatabase != NULL ) ;
 
     memset( destdatabase , 0 , size ) ;
 
     size_t size = m_bytesPerRow * m_height ;
     unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
     wxASSERT( destdatabase != NULL ) ;
 
     memset( destdatabase , 0 , size ) ;

-    unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
+    unsigned char * srcdatabase = (unsigned char*) bitmap.GetRawAccess() ;
+    size_t sourceBytesRow = bitmap.GetBitmapData()->GetBytesPerRow();

 
 

-    for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow)
+    for ( int y = 0 ; y < m_height ; ++y , srcdatabase+= sourceBytesRow, destdatabase += m_bytesPerRow)

     {
     {

+        unsigned char *srcdata = srcdatabase ;

         unsigned char *destdata = destdatabase ;
         unsigned char r, g, b;
 
         unsigned char *destdata = destdatabase ;
         unsigned char r, g, b;
 


@@ -1507,16 +1776,20 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
             if ( colour == wxColour( r , g , b ) )
             {
                 *destdata++ = 0xFF ;
             if ( colour == wxColour( r , g , b ) )
             {
                 *destdata++ = 0xFF ;

+#if !wxMAC_USE_CORE_GRAPHICS

                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;
                 *destdata++ = 0xFF ;

+#endif

             }
             else
             {
                 *destdata++ = 0x00 ;
             }
             else
             {
                 *destdata++ = 0x00 ;

+#if !wxMAC_USE_CORE_GRAPHICS

                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;
                 *destdata++ = 0x00 ;

+#endif

             }
         }
     }
             }
         }
     }


@@ -1536,25 +1809,7 @@ WXHBITMAP wxMask::GetHBITMAP() const
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 

-wxBitmapHandler::~wxBitmapHandler()
-{
-}
-
-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
-{
-    return false;
-}
-
-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-        int desiredWidth, int desiredHeight)
-{
-    return false;
-}
-
-bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
-{
-    return false;
-}
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)

 
 // ----------------------------------------------------------------------------
 // Standard Handlers
 
 // ----------------------------------------------------------------------------
 // Standard Handlers


@@ -1579,8 +1834,11 @@ public:
 IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
 
 

-bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight)
+bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap,
+                                     const wxString& name,
+                                     long WXUNUSED(flags),
+                                     int WXUNUSED(desiredWidth),
+                                     int WXUNUSED(desiredHeight))

 {
 #if wxUSE_METAFILE
     Str255 theName ;
 {
 #if wxUSE_METAFILE
     Str255 theName ;


@@ -1591,7 +1849,7 @@ bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lon
     {
         wxMetafile mf ;
 
     {
         wxMetafile mf ;
 

-        mf.SetHMETAFILE( (WXHMETAFILE) thePict ) ;
+        mf.SetPICT( thePict ) ;

         bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ;
         wxMemoryDC dc ;
         dc.SelectObject( *bitmap ) ;
         bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ;
         wxMemoryDC dc ;
         dc.SelectObject( *bitmap ) ;


@@ -1615,7 +1873,7 @@ void wxBitmap::InitStandardHandlers()
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 

-void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int WXUNUSED(bpp))

 {
     if ( !Ok() )
         // no bitmap, no data (raw or otherwise)
 {
     if ( !Ok() )
         // no bitmap, no data (raw or otherwise)


@@ -1623,12 +1881,12 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
 
     data.m_width = GetWidth() ;
     data.m_height = GetHeight() ;
 
     data.m_width = GetWidth() ;
     data.m_height = GetHeight() ;

-    data.m_stride = GetWidth() * 4 ;
+    data.m_stride = GetBitmapData()->GetBytesPerRow() ;

 
     return BeginRawAccess() ;
 }
 
 
     return BeginRawAccess() ;
 }
 

-void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(dataBase))

 {
     EndRawAccess() ;
 }
 {
     EndRawAccess() ;
 }