correct hhp2cached path

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index d98e6fd2dda27893fb97e215588a3db00a17a0c4..19334a0f7c88909ce1efc6fbdc03509a30680821 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:


@@ -9,16 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "bitmap.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
 #include "wx/wxprec.h"
 
 #include "wx/bitmap.h"

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

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


@@ -26,447 +27,736 @@
 
 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>
-#else
-    #include <PictUtils.h>
-#endif
+#include <ApplicationServices/ApplicationServices.h>
+#include <QuickTime/QuickTime.h>

 
 #include "wx/mac/uma.h"
 
 // Implementation Notes
 
 #include "wx/mac/uma.h"
 
 // Implementation Notes

-// -------------------- 
+// --------------------

 //
 //

-// we are always working with a 32 bit deep pixel buffer 
-// under QuickDraw its alpha parts are going to be ignored in the GWorld, 
+// we are always working with a 32 bit deep pixel buffer
+// under QuickDraw its alpha parts are going to be ignored in the GWorld,

 // therefore we have a separate GWorld there for blitting the mask in
 
 // 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
 
 // therefore we have a separate GWorld there for blitting the mask in
 
 // 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 premultiplied alpha yet
-#define wxMAC_USE_PREMULTIPLIED_ALPHA 0
-
-IconRef wxMacCreateIconRef(const wxBitmap& bmp)
+class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData

 {
 {

-    // setup the header properly
-    
-    IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(8) ;
-    (**iconFamily).resourceType = kIconFamilyType ;
-    (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
-    
-    int w = bmp.GetWidth() ;
-    int h = bmp.GetHeight() ;
-    int sz = wxMax( w , h ) ;
-    if ( sz > 128 )
-    {
-        wxFAIL_MSG( wxT("Currently only 128 pixels wide images are supported") ) ;
-    }
-    
-    Handle data = NULL ; 
-    Handle maskdata = NULL ;
-    unsigned char * maskptr = NULL ;
-    unsigned char * ptr = NULL ;
-    size_t size ;
-    size_t masksize ;
-    OSType dataType ;
-    OSType maskType ;
-
-    bool hasAlpha = bmp.HasAlpha() ;
-    wxMask *mask = bmp.GetMask() ;
-    // thumbnail is 128 x 128 with 32 bits per pixel
-    
-    if ( sz > 48 )
-    {
-        sz = 128 ;
-        dataType = kThumbnail32BitData ;
-        maskType = kThumbnail8BitMask ;
-    }
-    else if ( sz > 32 )
-    {
-        sz = 48 ;
-        dataType = kHuge32BitData ;
-        maskType = kHuge8BitMask ;
-    }
-    else if ( sz > 16 )
-    {
-        sz = 32 ;
-        dataType = kLarge32BitData ;
-        maskType = kLarge8BitMask ;
-    }
-    else 
-    {
-        sz = 16 ;
-        dataType = kSmall32BitData ;
-        maskType = kSmall8BitMask ;
-    }
+    friend class WXDLLIMPEXP_FWD_CORE wxIcon;
+    friend class WXDLLIMPEXP_FWD_CORE wxCursor;
+public:
+    wxBitmapRefData(int width , int height , int depth);
+    wxBitmapRefData();
+    wxBitmapRefData(const wxBitmapRefData &tocopy);

 
 

-    size = sz * sz * 4 ;
-    data = NewHandle( size) ;    
-    HLock( data ) ;
-    ptr = (unsigned char*) *data ;
-    memset( ptr , 0, size ) ;
-
-    masksize = sz * sz ;
-    maskdata = NewHandle( masksize ) ;    
-    HLock( maskdata ) ;
-    maskptr = (unsigned char*) *maskdata ;
-    memset( maskptr , 0 , masksize ) ;
-
-    unsigned char * source = (unsigned char*) bmp.GetRawAccess() ;
-    unsigned char * masksource = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
-    for ( int y = 0 ; y < h ; ++y )
-    {
-        unsigned char * dest = ptr + y * sz * 4 ;
-        unsigned char * maskdest = maskptr + y * sz ;
-        for ( int x = 0 ; x < w ; ++x )
-        {
-            unsigned char a = *source ++ ;
-            unsigned char r = *source ++ ;
-            unsigned char g = *source ++ ;
-            unsigned char b = *source ++ ;
-            
-            *dest++ = 0 ;
-            *dest++ = r ;
-            *dest++ = g ;
-            *dest++ = b ;
-            
-            if ( mask )
-                *maskdest++ = *masksource++ ;
-            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 ) ;
-
-    IconRef iconRef ;
-    static int iconCounter = 2 ;
-    
-    err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &iconRef ) ;
-    UInt16 owners ;
-    err = GetIconRefOwners(iconRef , &owners ) ;
-
-    wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-    // we have to retain a reference, as Unregister will decrement it 
-    AcquireIconRef( iconRef ) ;
-    UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;
-    DisposeHandle( (Handle) iconFamily ) ;
-    ++iconCounter ;
-    
-    return iconRef ;
+    virtual ~wxBitmapRefData();
+
+    virtual bool IsOk() const { return m_ok; }
+
+    void Free();
+    void SetOk( bool isOk) { m_ok = isOk; }
+
+    void SetWidth( int width ) { m_width = width; }
+    void SetHeight( int height ) { m_height = height; }
+    void SetDepth( int depth ) { m_depth = depth; }
+
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
+    int GetDepth() const { return m_depth; }
+
+    void *GetRawAccess() const;
+    void *BeginRawAccess();
+    void EndRawAccess();
+
+    bool HasAlpha() const { return m_hasAlpha; }
+    void UseAlpha( bool useAlpha );
+
+public:
+#if wxUSE_PALETTE
+    wxPalette     m_bitmapPalette;
+#endif // wxUSE_PALETTE
+
+    wxMask *      m_bitmapMask; // Optional mask
+    CGImageRef    CreateCGImage() const;
+
+    // returns true if the bitmap has a size that
+    // can be natively transferred into a true icon
+    // if no is returned GetIconRef will still produce
+    // an icon but it will be generated via a PICT and
+    // rescaled to 16 x 16
+    bool          HasNativeSize();
+
+    // caller should increase ref count if needed longer
+    // than the bitmap exists
+    IconRef       GetIconRef();
+
+    // returns a Pict from the bitmap content
+    PicHandle     GetPictHandle();
+
+    CGContextRef  GetBitmapContext() const;
+
+    int           GetBytesPerRow() const { return m_bytesPerRow; }
+    private :
+    bool Create(int width , int height , int depth);
+    void Init();
+
+    int           m_width;
+    int           m_height;
+    int           m_bytesPerRow;
+    int           m_depth;
+    bool          m_hasAlpha;
+    wxMemoryBuffer m_memBuf;
+    int           m_rawAccessCount;
+    bool          m_ok;
+    mutable CGImageRef    m_cgImageRef;
+
+    IconRef       m_iconRef;
+    PicHandle     m_pictHandle;
+
+    CGContextRef  m_hBitmap;
+};
+
+
+#define wxMAC_USE_PREMULTIPLIED_ALPHA 1
+static const int kBestByteAlignement = 16;
+static const int kMaskBytesPerPixel = 1;
+
+static int GetBestBytesPerRow( int rawBytes )
+{
+    return (((rawBytes)+kBestByteAlignement-1) & ~(kBestByteAlignement-1) );

 }
 
 }
 

+#if wxUSE_GUI
+
+// this is used for more controls than just the wxBitmap button, also for notebooks etc
+

 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
 {
     memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
     if ( bitmap.Ok() )
     {
 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
 {
     memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
     if ( bitmap.Ok() )
     {

-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ;
+        wxBitmapRefData * bmap = bitmap.GetBitmapData() ;

         if ( bmap == NULL )
             return ;
         if ( bmap == NULL )
             return ;

-        info->contentType = kControlContentIconRef ;
-        info->u.iconRef = wxMacCreateIconRef( bitmap ) ;  
-         
-#if wxMAC_USE_CORE_GRAPHICS              
-        /*
-            // only on 10.4 more controls will accept a CGImage
-        
+
+        if ( forceType == 0  )
+        {
+            forceType = kControlContentCGImageRef;
+        }
+
+        if ( forceType == kControlContentIconRef )
+        {
+            wxBitmap scaleBmp ;
+            wxBitmapRefData* bmp = bmap ;
+
+            if ( !bmap->HasNativeSize() )
+            {
+                // as PICT conversion will only result in a 16x16 icon, let's attempt
+                // a few scales for better results
+
+                int w = bitmap.GetWidth() ;
+                int h = bitmap.GetHeight() ;
+                int sz = wxMax( w , h ) ;
+                if ( sz == 24 || sz == 64 )
+                {
+                    scaleBmp = wxBitmap( bitmap.ConvertToImage().Scale( w * 2 , h * 2 ) ) ;
+                    bmp = scaleBmp.GetBitmapData() ;
+                }
+            }
+
+            info->contentType = kControlContentIconRef ;
+            info->u.iconRef = bmp->GetIconRef() ;
+            AcquireIconRef( info->u.iconRef ) ;
+        }
+        else if ( forceType == kControlContentCGImageRef )
+        {

             info->contentType = kControlContentCGImageRef ;
             info->contentType = kControlContentCGImageRef ;

-            info->u.imageRef = (CGImageRef) bmap->CGImageCreate() ;
-        */
+            info->u.imageRef = (CGImageRef) bmap->CreateCGImage() ;
+        }
+        else
+        {
+#ifndef __LP64__
+            info->contentType = kControlContentPictHandle ;
+            info->u.picture = bmap->GetPictHandle() ;

 #endif
 #endif

+        }

     }
 }
 
     }
 }
 

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

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

-        ReleaseIconRef(info->u.iconRef) ;
+        ReleaseIconRef( info->u.iconRef ) ;
+    }
+    else if ( info->contentType == kControlNoContent )
+    {
+        // there's no bitmap at all, fall through silently
+    }
+    else if ( info->contentType == kControlContentPictHandle )
+    {
+        // owned by the bitmap, no release here

     }
     }

-#if wxMAC_USE_CORE_GRAPHICS

     else if ( info->contentType == kControlContentCGImageRef )
     {
         CGImageRelease( info->u.imageRef ) ;
     }
     else if ( info->contentType == kControlContentCGImageRef )
     {
         CGImageRelease( info->u.imageRef ) ;
     }

-#endif

     else
     {
         wxFAIL_MSG(wxT("Unexpected bitmap type") ) ;
     }
 }
 
     else
     {
         wxFAIL_MSG(wxT("Unexpected bitmap type") ) ;
     }
 }
 

+#endif //wxUSE_BMPBUTTON
+
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)

 
 void wxBitmapRefData::Init()
 {
     m_width = 0 ;
     m_height = 0 ;
     m_depth = 0 ;
 
 void wxBitmapRefData::Init()
 {
     m_width = 0 ;
     m_height = 0 ;
     m_depth = 0 ;

+    m_bytesPerRow = 0;

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

-#if wxMAC_USE_CORE_GRAPHICS

     m_cgImageRef = NULL ;
     m_cgImageRef = NULL ;

-#else
+
+    m_iconRef = NULL ;
+    m_pictHandle = NULL ;

     m_hBitmap = NULL ;
     m_hBitmap = NULL ;

-    m_hMaskBitmap = NULL;
-    m_maskBytesPerRow = NULL ;
-#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() ;
 }
 

-wxBitmapRefData::wxBitmapRefData( int w , int h , int d ) 
+wxBitmapRefData::wxBitmapRefData( int w , int h , int d )

 {
     Init() ;
     Create( w , h , d ) ;
 }
 
 {
     Init() ;
     Create( w , h , d ) ;
 }
 

-bool wxBitmapRefData::Create( int w , int h , int d ) 
+bool wxBitmapRefData::Create( int w , int h , int d )

 {
 {

-    m_width = w ;
-    m_height = h ; 
+    m_width = wxMax(1, w);
+    m_height = wxMax(1, h);

     m_depth = d ;
     m_depth = d ;

+    m_hBitmap = NULL ;

 
 

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

     size_t size = m_bytesPerRow * h ;
     size_t size = m_bytesPerRow * h ;

-    void*  data = m_memBuf.GetWriteBuf(size) ;
-    memset( data ,  0 , size) ;
-    m_memBuf.UngetWriteBuf(size) ;
-#if wxMAC_USE_CORE_GRAPHICS
-    m_ok = true ;
-#else
-    m_hBitmap = NULL ;
-    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") ) ;
+    void* data = m_memBuf.GetWriteBuf( size ) ;
+    if ( data != NULL )
+    {
+        memset( data , 0 , size ) ;
+        m_memBuf.UngetWriteBuf( size ) ;
+
+        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 );
+    } /* data != NULL */

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

-#endif 
-    return m_ok ;   
+
+    return m_ok ;

 }
 
 void wxBitmapRefData::UseAlpha( bool use )
 {
     if ( m_hasAlpha == use )
         return ;
 }
 
 void wxBitmapRefData::UseAlpha( bool use )
 {
     if ( m_hasAlpha == use )
         return ;

-        
+

     m_hasAlpha = use ;
     m_hasAlpha = use ;

-#if !wxMAC_USE_CORE_GRAPHICS
-    if ( m_hasAlpha )
-    {
-        int width = GetWidth() ;
-        int height = GetHeight() ;
-        m_maskBytesPerRow = ( width + 3 ) & 0xFFFFFFC ;
-        size_t size = height * m_maskBytesPerRow ;
-        unsigned char * data = (unsigned char * ) m_maskMemBuf.GetWriteBuf( size ) ;
-        memset( data , 0 , size ) ;
-        wxASSERT( m_hMaskBitmap == NULL ) ;
-        Rect rect = { 0 , 0 , height , width } ;
-        verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k8IndexedGrayPixelFormat , &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) ;
-        UpdateAlphaMask() ;
-    }
-    else
-    {
-        DisposeGWorld( m_hMaskBitmap ) ;
-        m_hMaskBitmap = NULL ;
-        m_maskBytesPerRow = 0 ;
-    }
-#endif
+
+    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 );

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

-    wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+    wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ;

     return m_memBuf.GetData() ;
 }
 
     return m_memBuf.GetData() ;
 }
 

-void *wxBitmapRefData::BeginRawAccess() 
+void *wxBitmapRefData::BeginRawAccess()

 {
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ) ;
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ) ;

     wxASSERT( m_rawAccessCount == 0 ) ;
     wxASSERT( m_rawAccessCount == 0 ) ;

+    wxASSERT_MSG( m_pictHandle == NULL && m_iconRef == NULL ,
+        wxT("Currently, modifing bitmaps that are used in controls already is not supported") ) ;
+

     ++m_rawAccessCount ;
     ++m_rawAccessCount ;

-#if wxMAC_USE_CORE_GRAPHICS
-     // we must destroy an existing cached image, as
+
+    // we must destroy an existing cached image, as

     // the bitmap data may change now
     if ( m_cgImageRef )
     {
         CGImageRelease( m_cgImageRef ) ;
         m_cgImageRef = NULL ;
     }
     // the bitmap data may change now
     if ( m_cgImageRef )
     {
         CGImageRelease( m_cgImageRef ) ;
         m_cgImageRef = NULL ;
     }

-#endif
+

     return m_memBuf.GetData() ;
 }
 
 void wxBitmapRefData::EndRawAccess()
 {
     return m_memBuf.GetData() ;
 }
 
 void wxBitmapRefData::EndRawAccess()
 {

-    wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
+    wxCHECK_RET( IsOk() , wxT("invalid bitmap") ) ;

     wxASSERT( m_rawAccessCount == 1 ) ;
     wxASSERT( m_rawAccessCount == 1 ) ;

+

     --m_rawAccessCount ;
     --m_rawAccessCount ;

-#if !wxMAC_USE_CORE_GRAPHICS
-    UpdateAlphaMask() ;
-#endif

 }
 
 }
 

-
-#if wxMAC_USE_CORE_GRAPHICS
-static void FreeImageMemoryBufferInstance(void *info, const void *data, size_t size)
+bool wxBitmapRefData::HasNativeSize()

 {
 {

-    delete ((wxMemoryBuffer*)info) ;
+    int w = GetWidth() ;
+    int h = GetHeight() ;
+    int sz = wxMax( w , h ) ;
+
+    return ( sz == 128 || sz == 48 || sz == 32 || sz == 16 );

 }
 
 }
 

-CGImageRef wxBitmapRefData::CGImageCreate() const
+IconRef wxBitmapRefData::GetIconRef()

 {
 {

-    wxASSERT( m_ok ) ;
-    wxASSERT( m_rawAccessCount >= 0 ) ;
-    CGImageRef image ;
-    if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
+    if ( m_iconRef == 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 )
+        // Create Icon Family Handle
+
+        IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle( 0 );
+
+        int w = GetWidth() ;
+        int h = GetHeight() ;
+        int sz = wxMax( w , h ) ;
+
+        OSType dataType = 0 ;
+        OSType maskType = 0 ;
+
+        switch (sz)

         {
         {

-            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() ;
-            alphaInfo = kCGImageAlphaFirst ;
-            for ( int y = 0 ; y < h ; ++y , sourcemaskstart += maskrowbytes)
-            {
-                unsigned char *sourcemask = sourcemaskstart ;
-                for( int x = 0 ; x < w ; ++x , sourcemask++ , destalpha += 4 )
+            case 128:
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( UMAGetSystemVersion() >= 0x1050 )

                 {
                 {

-                    *destalpha = *sourcemask ;
+                    dataType = kIconServices128PixelDataARGB ;

                 }
                 }

-            }
+                else
+#endif
+                {
+                    dataType = kThumbnail32BitData ;
+                    maskType = kThumbnail8BitMask ;
+                }
+                break;
+
+            case 48:
+#if 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:
+#if 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:
+#if 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;

         }
         }

-        else if ( m_hasAlpha )
+
+        if ( dataType != 0 )

         {
         {

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+            if (  maskType == 0 && UMAGetSystemVersion() >= 0x1050 )
+            {
+                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 )
+                {
+                    unsigned char * source = sourcePtr;
+                    unsigned char * masksource = masksourcePtr;
+                    unsigned char * dest = ptr + y * sz * 4 ;
+                    unsigned char a, r, g, 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
 #if wxMAC_USE_PREMULTIPLIED_ALPHA

-            alphaInfo = kCGImageAlphaPremultipliedFirst ;
-#else
-            alphaInfo = kCGImageAlphaFirst ;
+                            // 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 ;
+
+                     }
+                }
+                HUnlock( data );
+                OSStatus err = SetIconFamilyData( iconFamily, dataType , data );
+                wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") );
+                DisposeHandle( data );
+            }
+            else

 #endif
 #endif

-            membuf = new wxMemoryBuffer( m_memBuf ) ;
+            {
+                // 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 )
+                    {
+                        a = *source ++ ;
+                        r = *source ++ ;
+                        g = *source ++ ;
+                        b = *source ++ ;
+
+                        *dest++ = 0 ;
+                        *dest++ = r ;
+                        *dest++ = g ;
+                        *dest++ = b ;
+
+                        if ( mask )
+                            *maskdest++ = 0xFF - *masksource++ ;
+                        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 ) ;
+            }

         }
         else
         {
         }
         else
         {

-            membuf = new wxMemoryBuffer( m_memBuf ) ;
+            PicHandle pic = GetPictHandle() ;
+            SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;

         }
         }

-        CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
-       CGDataProviderRef dataProvider = 
-           CGDataProviderCreateWithData( membuf , (const void *)membuf->GetData() , imageSize, FreeImageMemoryBufferInstance );
-        image = 
-           ::CGImageCreate( w, h, 8 , 32 , 4 * m_width , colorSpace, alphaInfo , 
-                       dataProvider, NULL , false , kCGRenderingIntentDefault );
-       CGDataProviderRelease( dataProvider);
-    }
-    else
-    {
-        image = m_cgImageRef ;
-        CGImageRetain( image ) ;
+        // transform into IconRef
+
+        // cleaner version existing from 10.3 upwards
+        HLock((Handle) iconFamily);
+        OSStatus err = GetIconRefFromIconFamilyPtr( *iconFamily, GetHandleSize((Handle) iconFamily), &m_iconRef );
+        HUnlock((Handle) iconFamily);
+        DisposeHandle( (Handle) iconFamily ) ;
+
+        wxCHECK_MSG( err == noErr, NULL, wxT("Error when constructing icon ref") );

     }
     }

-    if ( m_rawAccessCount == 0 && m_cgImageRef == NULL)
-    {
-        // we keep it for later use
-        m_cgImageRef = image ;
-        CGImageRetain( image ) ;
-    } 
-    return image ;
+
+    return m_iconRef ;

 }
 }

-#endif

 
 

-#if !wxMAC_USE_CORE_GRAPHICS
-GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const
+PicHandle wxBitmapRefData::GetPictHandle()

 {
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
-    if ( mask )
+    if ( m_pictHandle == NULL )

     {
     {

-        *mask = NULL ;
-        if ( m_bitmapMask )
-            *mask = (GWorldPtr) m_bitmapMask->GetHBITMAP() ;        
-        else if ( m_hasAlpha )
+#ifndef __LP64__
+        GraphicsExportComponent exporter = 0;
+        OSStatus err = OpenADefaultComponent(GraphicsExporterComponentType, kQTFileTypePicture, &exporter);
+        if (noErr == err)

         {
         {

-            if ( m_rawAccessCount > 0 )
-                UpdateAlphaMask() ;
-            *mask = m_hMaskBitmap ;
+            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 = CreateCGImage();
+                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

     }
     }

-    return m_hBitmap ;
+
+    return m_pictHandle ;

 }
 
 }
 

-void wxBitmapRefData::UpdateAlphaMask() const 
+CGImageRef wxBitmapRefData::CreateCGImage() const

 {
 {

-    if ( m_hasAlpha )
+    wxASSERT( m_ok ) ;
+    wxASSERT( m_rawAccessCount >= 0 ) ;
+    CGImageRef image ;
+    if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )

     {
     {

-        unsigned char *sourcemask = (unsigned char *) GetRawAccess() ;
-        unsigned char *destalphabase = (unsigned char *) m_maskMemBuf.GetData() ;
-     
-        int h = GetHeight() ;
-        int w = GetWidth() ;
-     
-        for ( int y = 0 ; y < h ; ++y , destalphabase += m_maskBytesPerRow )
+        if ( m_depth != 1 && m_bitmapMask == NULL )

         {
         {

-            unsigned char* destalpha = destalphabase ;
-            for( int x = 0 ; x < w ; ++x , sourcemask += 4, ++destalpha )
+            if ( m_bitmapMask )

             {
             {

-                *destalpha = *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
+        {
+            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;
+
+            if ( m_bitmapMask )
+            {
+                alphaInfo = kCGImageAlphaFirst ;
+                unsigned char *destalphastart = (unsigned char*) membuf.GetWriteBuf( imageSize ) ;
+                memcpy( destalphastart , dataBuffer , imageSize ) ;
+                unsigned char *sourcemaskstart = (unsigned char *) m_bitmapMask->GetRawAccess() ;
+                int maskrowbytes = m_bitmapMask->GetBytesPerRow() ;
+                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 ;
+                    }
+                }
+                membuf.UngetWriteBuf( imageSize );
+            }
+            else
+            {
+                if ( m_hasAlpha )
+                {
+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+                    alphaInfo = kCGImageAlphaPremultipliedFirst ;
+#else
+                    alphaInfo = kCGImageAlphaFirst ;
+#endif
+                }
+
+                membuf = m_memBuf;
+            }
+
+            CGDataProviderRef dataProvider = NULL ;
+            if ( m_depth == 1 )
+            {
+                // TODO CHECK ALIGNMENT
+                wxMemoryBuffer maskBuf;
+                unsigned char * maskBufData = (unsigned char*) maskBuf.GetWriteBuf( m_width * m_height );
+                unsigned char * bufData = (unsigned char *) membuf.GetData() ;
+                // copy one color component
+                size_t i = 0;
+                for( int y = 0 ; y < m_height ; bufData+= m_bytesPerRow, ++y )
+                {
+                    unsigned char *bufDataIter = bufData+3;
+                    for ( int x = 0 ; x < m_width ; bufDataIter += 4, ++x, ++i )
+                    {
+                        maskBufData[i] = *bufDataIter;
+                    }
+                }
+                maskBuf.UngetWriteBuf( m_width * m_height );
+
+                dataProvider =
+                    wxMacCGDataProviderCreateWithMemoryBuffer( maskBuf );
+
+                image = ::CGImageMaskCreate( w, h, 8, 8, m_width , dataProvider, NULL, false );
+            }
+            else
+            {
+                CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
+                dataProvider = wxMacCGDataProviderCreateWithMemoryBuffer( membuf );
+                image =
+                    ::CGImageCreate(
+                                    w, h, 8 , 32 , m_bytesPerRow , colorSpace, alphaInfo ,
+                                    dataProvider, NULL , false , kCGRenderingIntentDefault );
+            }
+            CGDataProviderRelease( dataProvider);
+        }
+    }
+    else
+    {
+        image = m_cgImageRef ;
+        CGImageRetain( image ) ;

     }
     }

+
+    if ( m_rawAccessCount == 0 && m_cgImageRef == NULL)
+    {
+        // we keep it for later use
+        m_cgImageRef = image ;
+        CGImageRetain( image ) ;
+    }
+
+    return image ;

 }
 
 }
 

-#endif
+CGContextRef wxBitmapRefData::GetBitmapContext() const
+{
+    return m_hBitmap;
+}

 
 void wxBitmapRefData::Free()
 {
     wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ;
 
 
 void wxBitmapRefData::Free()
 {
     wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ;
 

-#if wxMAC_USE_CORE_GRAPHICS

     if ( m_cgImageRef )
     {
         CGImageRelease( m_cgImageRef ) ;
         m_cgImageRef = NULL ;
     }
     if ( m_cgImageRef )
     {
         CGImageRelease( m_cgImageRef ) ;
         m_cgImageRef = NULL ;
     }

-#else
-    if ( m_hBitmap )
+
+    if ( m_iconRef )

     {
     {

-        DisposeGWorld( MAC_WXHBITMAP(m_hBitmap) ) ;
-        m_hBitmap = NULL ;
+        ReleaseIconRef( m_iconRef ) ;
+        m_iconRef = NULL ;

     }
     }

-    if ( m_hMaskBitmap )
+
+#ifndef __LP64__
+    if ( m_pictHandle )

     {
     {

-        DisposeGWorld( MAC_WXHBITMAP(m_hMaskBitmap) ) ;
-        m_hMaskBitmap = NULL ;
+        KillPicture( m_pictHandle ) ;
+        m_pictHandle = NULL ;

     }
 #endif
 
     }
 #endif
 

+    if ( m_hBitmap )
+    {
+        CGContextRelease(m_hBitmap);
+        m_hBitmap = NULL ;
+    }
+

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


@@ -481,47 +771,106 @@ wxBitmapRefData::~wxBitmapRefData()
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {

+    bool created = false ;

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

+

     Create( icon.GetWidth() , icon.GetHeight() ) ;
 
     Create( icon.GetWidth() , icon.GetHeight() ) ;
 

-    if ( w == h && w == 32 )
+    if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) )

     {
         IconFamilyHandle iconFamily = NULL ;
     {
         IconFamilyHandle iconFamily = NULL ;

-        Handle imagehandle = NewHandle(0) ;
-        Handle maskhandle = NewHandle(0) ;
-        OSStatus err = ( IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , kSelectorLarge32Bit | kSelectorLarge8BitMask , &iconFamily ) ) ;
-        err =( GetIconFamilyData( iconFamily , kLarge32BitData , imagehandle ) ) ;
-        err =( GetIconFamilyData( iconFamily , kLarge8BitMask , maskhandle ) ) ;
-        wxASSERT( GetHandleSize( imagehandle ) == w * 4 * h ) ;
-        wxASSERT( GetHandleSize( maskhandle ) == w * h ) ;
-        UseAlpha() ;
-        unsigned char *source = (unsigned char *) *imagehandle ;
-        unsigned char *sourcemask = (unsigned char *) *maskhandle ;
-        
-        unsigned char* destination = (unsigned char*) BeginRawAccess() ;
-        for ( int y = 0 ; y < h ; ++y )
+        Handle imagehandle = NewHandle( 0 ) ;
+        Handle maskhandle = NewHandle( 0 ) ;
+
+        OSType maskType = 0;
+        OSType dataType = 0;
+        IconSelectorValue selector = 0 ;
+
+        switch (w)

         {
         {

-            for ( int x = 0 ; x < w ; ++x )
+            case 128:
+                dataType = kThumbnail32BitData ;
+                maskType = kThumbnail8BitMask ;
+                selector = kSelectorAllAvailableData ;
+                break;
+
+            case 48:
+                dataType = kHuge32BitData ;
+                maskType = kHuge8BitMask ;
+                selector = kSelectorHuge32Bit | kSelectorHuge8BitMask ;
+                break;
+
+            case 32:
+                dataType = kLarge32BitData ;
+                maskType = kLarge8BitMask ;
+                selector = kSelectorLarge32Bit | kSelectorLarge8BitMask ;
+                break;
+
+            case 16:
+                dataType = kSmall32BitData ;
+                maskType = kSmall8BitMask ;
+                selector = kSelectorSmall32Bit | kSelectorSmall8BitMask ;
+                break;
+
+            default:
+                break;
+        }
+
+        OSStatus err = IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , selector , &iconFamily ) ;
+
+        err = GetIconFamilyData( iconFamily , dataType , imagehandle ) ;
+        err = GetIconFamilyData( iconFamily , maskType , maskhandle ) ;
+        size_t imagehandlesize = GetHandleSize( imagehandle ) ;
+        size_t maskhandlesize = GetHandleSize( maskhandle ) ;
+
+        if ( imagehandlesize != 0 && maskhandlesize != 0 )
+        {
+            wxASSERT( GetHandleSize( imagehandle ) == w * 4 * h ) ;
+            wxASSERT( GetHandleSize( maskhandle ) == w * h ) ;
+
+            UseAlpha() ;
+
+            unsigned char *source = (unsigned char *) *imagehandle ;
+            unsigned char *sourcemask = (unsigned char *) *maskhandle ;
+            unsigned char* destination = (unsigned char*) BeginRawAccess() ;
+
+            for ( int y = 0 ; y < h ; ++y )

             {
             {

-                *destination++ = *sourcemask++ ;
-                source++ ;
-                *destination++ = *source++ ;
-                *destination++ = *source++ ;
-                *destination++ = *source++ ;
+                for ( int x = 0 ; x < w ; ++x )
+                {
+                    unsigned char a = *sourcemask++;
+                    *destination++ = a;
+                    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++ ;
+#endif
+                }

             }
             }

+
+            EndRawAccess() ;
+            DisposeHandle( imagehandle ) ;
+            DisposeHandle( maskhandle ) ;
+            created = true ;

         }
         }

-        EndRawAccess() ;
-        DisposeHandle( imagehandle ) ;
-        DisposeHandle( maskhandle ) ;
+
+        DisposeHandle( (Handle) iconFamily ) ;

     }
     }

-    else
-    {            
+
+    if ( !created )
+    {

         wxMemoryDC dc ;
         dc.SelectObject( *this ) ;
         dc.DrawIcon( icon , 0 , 0 ) ;
         dc.SelectObject( wxNullBitmap ) ;
     }
         wxMemoryDC dc ;
         dc.SelectObject( *this ) ;
         dc.DrawIcon( icon , 0 , 0 ) ;
         dc.SelectObject( wxNullBitmap ) ;
     }

+

     return true;
 }
 
     return true;
 }
 


@@ -535,45 +884,56 @@ wxBitmap::~wxBitmap()
 
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 {
 
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 {

-    m_refData = new wxBitmapRefData( the_width , the_height , no_bits ) ;
+    wxBitmapRefData* bitmapRefData;
+
+    m_refData = bitmapRefData = new wxBitmapRefData( the_width , the_height , no_bits ) ;

 
 

-    if ( no_bits == 1 )
+    if (bitmapRefData->IsOk())

     {
     {

-        int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
-        if ( the_width % (sizeof(unsigned char) * 8) ) {
-            linesize += sizeof(unsigned char);
-        }
-        unsigned char* linestart = (unsigned char*) bits ;
-        unsigned char* destination = (unsigned char*) BeginRawAccess() ;
-        for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
+        if ( no_bits == 1 )

         {
         {

-            for ( int x = 0 ; x < the_width ; ++x )
+            int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
+            if ( the_width % (sizeof(unsigned char) * 8) )
+                linesize += sizeof(unsigned char);
+
+            unsigned char* linestart = (unsigned char*) bits ;
+            unsigned char* destptr = (unsigned char*) BeginRawAccess() ;
+
+            for ( int y = 0 ; y < the_height ; ++y , linestart += linesize, destptr += M_BITMAPDATA->GetBytesPerRow() )

             {
             {

-                int index = x / 8 ;
-                int bit = x % 8 ;
-                int mask = 1 << bit ;
-                if ( linestart[index] & mask )
-                {
-                    *destination++ = 0xFF ;
-                    *destination++ = 0 ;
-                    *destination++ = 0 ;
-                    *destination++ = 0 ;
-                }
-                else
+                unsigned char* destination = destptr;
+                int index, bit, mask;
+
+                for ( int x = 0 ; x < the_width ; ++x )

                 {
                 {

-                    *destination++ = 0xFF ;
-                    *destination++ = 0xFF ;
-                    *destination++ = 0xFF ;
-                    *destination++ = 0xFF ;
+                    index = x / 8 ;
+                    bit = x % 8 ;
+                    mask = 1 << bit ;
+
+                    if ( linestart[index] & mask )
+                    {
+                        *destination++ = 0xFF ;
+                        *destination++ = 0 ;
+                        *destination++ = 0 ;
+                        *destination++ = 0 ;
+                    }
+                    else
+                    {
+                        *destination++ = 0xFF ;
+                        *destination++ = 0xFF ;
+                        *destination++ = 0xFF ;
+                        *destination++ = 0xFF ;
+                    }

                 }
             }
                 }
             }

+
+            EndRawAccess() ;

         }
         }

-        EndRawAccess() ;
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
-    }
+        else
+        {
+            wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
+        }
+    } /* bitmapRefData->IsOk() */

 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)


@@ -581,7 +941,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);
 }


@@ -591,51 +951,57 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, type);
 }
 
     LoadFile(filename, type);
 }
 

-wxBitmap::wxBitmap(const char **bits)
+wxGDIRefData* wxBitmap::CreateGDIRefData() const

 {
 {

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

 }
 
 }
 

-wxBitmap::wxBitmap(char **bits)
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const

 {
 {

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

 }
 
 }
 

-void* wxBitmap::GetRawAccess() const
+void * wxBitmap::GetRawAccess() const

 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;

+

     return M_BITMAPDATA->GetRawAccess() ;
 }
 
     return M_BITMAPDATA->GetRawAccess() ;
 }
 

-void* wxBitmap::BeginRawAccess() 
+void * wxBitmap::BeginRawAccess()

 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
 {
     wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;

+

     return M_BITMAPDATA->BeginRawAccess() ;
 }
 
 void wxBitmap::EndRawAccess()
 {
     wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
     return M_BITMAPDATA->BeginRawAccess() ;
 }
 
 void wxBitmap::EndRawAccess()
 {
     wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;

+

     M_BITMAPDATA->EndRawAccess() ;
 }
 
     M_BITMAPDATA->EndRawAccess() ;
 }
 

-bool wxBitmap::CreateFromXpm(const char **bits)
+CGImageRef wxBitmap::CreateCGImage() const

 {
 {

-    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;
+    wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+
+    return M_BITMAPDATA->CreateCGImage() ;

 }
 
 }
 

-#if wxMAC_USE_CORE_GRAPHICS
-WXCGIMAGEREF wxBitmap::CGImageCreate() const
+IconRef wxBitmap::GetIconRef() const

 {
     wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
 {
     wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;

-    return M_BITMAPDATA->CGImageCreate() ;
+
+    return M_BITMAPDATA->GetIconRef() ;
+}
+
+IconRef wxBitmap::CreateIconRef() const
+{
+    IconRef icon = GetIconRef();
+    verify_noerr( AcquireIconRef(icon) );
+    return icon;

 }
 }

-#endif

 
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 {
 
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 {


@@ -645,45 +1011,51 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
                 (rect.y+rect.height <= GetHeight()),
                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
 
                 (rect.y+rect.height <= GetHeight()),
                 wxNullBitmap, wxT("invalid bitmap or bitmap region") );
 

-

     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 ;

+

     {
     {

-        unsigned char * sourcedata = (unsigned char*) GetRawAccess() ;
-        unsigned char * destdata = (unsigned char*) ret.BeginRawAccess() ;
-        int sourcelinesize = sourcewidth * 4 ;
-        int destlinesize = destwidth * 4 ;
+        unsigned char *sourcedata = (unsigned char*) GetRawAccess() ;
+        unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ;
+        wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ;
+
+        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 ;

-        for(int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+
+        for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)

         {
             memcpy( dest , source , destlinesize ) ;
         }
     }
         {
             memcpy( dest , source , destlinesize ) ;
         }
     }

+

     ret.EndRawAccess() ;
     ret.EndRawAccess() ;

-  
+

     if ( M_BITMAPDATA->m_bitmapMask )
     {
         wxMemoryBuffer maskbuf ;
     if ( M_BITMAPDATA->m_bitmapMask )
     {
         wxMemoryBuffer maskbuf ;

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

         size_t maskbufsize = rowBytes * destheight ;
         size_t maskbufsize = rowBytes * destheight ;

-        unsigned char * destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ;

 
 

-        int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow()  ;
+        int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ;

         int destlinesize = rowBytes ;
         int destlinesize = rowBytes ;

+

         unsigned char *source = (unsigned char *) M_BITMAPDATA->m_bitmapMask->GetRawAccess() ;
         unsigned char *source = (unsigned char *) M_BITMAPDATA->m_bitmapMask->GetRawAccess() ;

-        source += rect.x + rect.y * sourcelinesize ;
+        unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ;
+        wxASSERT( (source != NULL) && (destdata != NULL) ) ;
+
+        source += rect.x * kMaskBytesPerPixel + rect.y * sourcelinesize ;

         unsigned char *dest = destdata ;
 
         unsigned char *dest = destdata ;
 

-        for(int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+        for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)

         {
             memcpy( dest , source , destlinesize ) ;
         }
         {
             memcpy( dest , source , destlinesize ) ;
         }

+

         maskbuf.UngetWriteBuf( maskbufsize ) ;
         ret.SetMask( new wxMask( maskbuf , destwidth , destheight , rowBytes ) ) ;
     }
         maskbuf.UngetWriteBuf( maskbufsize ) ;
         ret.SetMask( new wxMask( maskbuf , destwidth , destheight , rowBytes ) ) ;
     }


@@ -702,7 +1074,7 @@ bool wxBitmap::Create(int w, int h, int d)
 
     m_refData = new wxBitmapRefData( w , h , d );
 
 
     m_refData = new wxBitmapRefData( w , h , d );
 

-    return M_BITMAPDATA->Ok() ;
+    return M_BITMAPDATA->IsOk() ;

 }
 
 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
 }
 
 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)


@@ -719,17 +1091,23 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     }
     else
     {
     }
     else
     {

+#if wxUSE_IMAGE

         wxImage loadimage(filename, type);
         wxImage loadimage(filename, type);

-        if (loadimage.Ok()) {
+        if (loadimage.Ok())
+        {

             *this = loadimage;
             *this = loadimage;

+

             return true;
         }
             return true;
         }

+#endif

     }
     }

+

     wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
     wxLogWarning(wxT("no bitmap handler for type %d defined."), 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();
 


@@ -737,77 +1115,88 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int
 
     wxBitmapHandler *handler = FindHandler(type);
 
 
     wxBitmapHandler *handler = FindHandler(type);
 

-    if ( handler == NULL ) {
+    if ( handler == NULL )
+    {

         wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
 
         wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
 

-        return FALSE;
+        return false;

     }
 
     return handler->Create(this, data, type, width, height, depth);
 }
 
     }
 
     return handler->Create(this, data, type, width, height, depth);
 }
 

+#if wxUSE_IMAGE
+

 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {

-    wxCHECK_RET( image.Ok(), wxT("invalid image") )
+    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 ) ;;
-
-    // Create picture
-
-    bool hasAlpha = false ;
+    wxBitmapRefData* bitmapRefData;

     
     

-    if ( image.HasMask() )
-    {
-        // takes precedence, don't mix with alpha info
-    }
-    else
-    {
-        hasAlpha = image.HasAlpha() ;
-    }
-    
-    if ( hasAlpha )
-        UseAlpha() ;
-        
-    unsigned char* destination = (unsigned char*) BeginRawAccess() ;
+    m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;

 
 

-    register unsigned char* data = image.GetData();
-    const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
-    for (int y = 0; y < height; y++)
+    if ( bitmapRefData->IsOk())

     {
     {

-        for (int x = 0; x < width; x++)
+        // Create picture
+
+        bool hasAlpha = false ;
+
+        if ( image.HasMask() )

         {
         {

-            if ( hasAlpha )
-            {
-                const unsigned char a = *alpha++;
-                *destination++ = a ;
-#if wxMAC_USE_PREMULTIPLIED_ALPHA
-                *destination++ = ((*data++) * a + 127 ) / 255 ;
-                *destination++ = ((*data++) * a + 127 ) / 255 ;
-                *destination++ = ((*data++) * a + 127 ) / 255 ;
-#else
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
-#endif
-            }
-            else
+            // takes precedence, don't mix with alpha info
+        }
+        else
+        {
+            hasAlpha = image.HasAlpha() ;
+        }
+
+        if ( hasAlpha )
+            UseAlpha() ;
+
+        unsigned char* destinationstart = (unsigned char*) BeginRawAccess() ;
+        register unsigned char* data = image.GetData();
+        if ( destinationstart != NULL && data != NULL )
+        {
+            const unsigned char *alpha = hasAlpha ? image.GetAlpha() : NULL ;
+            for (int y = 0; y < height; destinationstart += M_BITMAPDATA->GetBytesPerRow(), y++)

             {
             {

-                *destination++ = 0xFF ;
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
-                *destination++ = *data++ ;
+                unsigned char * destination = destinationstart;
+                for (int x = 0; x < width; x++)
+                {
+                    if ( hasAlpha )
+                    {
+                        const unsigned char a = *alpha++;
+                        *destination++ = a ;
+
+    #if wxMAC_USE_PREMULTIPLIED_ALPHA
+                        *destination++ = ((*data++) * a + 127) / 255 ;
+                        *destination++ = ((*data++) * a + 127) / 255 ;
+                        *destination++ = ((*data++) * a + 127) / 255 ;
+    #else
+                        *destination++ = *data++ ;
+                        *destination++ = *data++ ;
+                        *destination++ = *data++ ;
+    #endif
+                    }
+                    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() ) ) ) ;
+    } /* bitmapRefData->IsOk() */

 }
 
 wxImage wxBitmap::ConvertToImage() const
 }
 
 wxImage wxBitmap::ConvertToImage() const


@@ -824,21 +1213,22 @@ 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 ;

+    int maskBytesPerRow = 0 ;

     unsigned char *alpha = NULL ;
     unsigned char *mask = NULL ;
     unsigned char *alpha = NULL ;
     unsigned char *mask = NULL ;

+

     if ( HasAlpha() )
     if ( HasAlpha() )

-    {

         hasAlpha = true ;
         hasAlpha = true ;

-    }

 
     if ( GetMask() )
     {
         hasMask = true ;
         mask = (unsigned char*) GetMask()->GetRawAccess() ;
 
     if ( GetMask() )
     {
         hasMask = true ;
         mask = (unsigned char*) GetMask()->GetRawAccess() ;

+        maskBytesPerRow = GetMask()->GetBytesPerRow() ;

     }
 
     if ( hasAlpha )
     }
 
     if ( hasAlpha )


@@ -846,78 +1236,101 @@ wxImage wxBitmap::ConvertToImage() const
         image.SetAlpha() ;
         alpha = image.GetAlpha() ;
     }
         image.SetAlpha() ;
         alpha = image.GetAlpha() ;
     }

+

     int index = 0;
     int index = 0;

-    
+

     // The following masking algorithm is the same as well in msw/gtk:
     // the colour used as transparent one in wxImage and the one it is
     // The following masking algorithm is the same as well in msw/gtk:
     // the colour used as transparent one in wxImage and the one it is

-    // replaced with when it really occurs in the bitmap
+    // replaced with when it actually occurs in the bitmap

     static const int MASK_RED = 1;
     static const int MASK_GREEN = 2;
     static const int MASK_BLUE = 3;
     static const int MASK_BLUE_REPLACEMENT = 2;
 
     static const int MASK_RED = 1;
     static const int MASK_GREEN = 2;
     static const int MASK_BLUE = 3;
     static const int MASK_BLUE_REPLACEMENT = 2;
 

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

     {
     {

+        unsigned char * maskp = mask ;
+        unsigned char * source = sourcestart;
+        unsigned char a, r, g, b;
+        long color;
+

         for (int xx = 0; xx < width; xx++)
         {
         for (int xx = 0; xx < width; xx++)
         {

-            long color = *((long*) source) ;
-            unsigned char a = ((color&0xFF000000) >> 24) ;
-            unsigned char r = ((color&0x00FF0000) >> 16) ;
-            unsigned char g = ((color&0x0000FF00) >> 8) ;
-            unsigned char b = (color&0x000000FF);
+            color = *((long*) source) ;
+#ifdef WORDS_BIGENDIAN
+            a = ((color&0xFF000000) >> 24) ;
+            r = ((color&0x00FF0000) >> 16) ;
+            g = ((color&0x0000FF00) >> 8) ;
+            b = (color&0x000000FF);
+#else
+            b = ((color&0xFF000000) >> 24) ;
+            g = ((color&0x00FF0000) >> 16) ;
+            r = ((color&0x0000FF00) >> 8) ;
+            a = (color&0x000000FF);
+#endif

             if ( hasMask )
             {
             if ( hasMask )
             {

-                if ( *mask++ == 0 )
-                {
-                    if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
-                        b = MASK_BLUE_REPLACEMENT ;
-                }
-                else
+                if ( *maskp++ == 0xFF )

                 {
                     r = MASK_RED ;
                     g = MASK_GREEN ;
                     b = MASK_BLUE ;
                 }
                 {
                     r = MASK_RED ;
                     g = MASK_GREEN ;
                     b = MASK_BLUE ;
                 }

+                else if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
+                    b = MASK_BLUE_REPLACEMENT ;

             }
             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 + 2] = b ;
 
             data[index    ] = r ;
             data[index + 1] = g ;
             data[index + 2] = b ;

+

             index += 3;
             source += 4 ;
         }
     }
             index += 3;
             source += 4 ;
         }
     }

+

     if ( hasMask )
         image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
     if ( hasMask )
         image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );

+

     return image;
 }
 
     return image;
 }
 

+#endif //wxUSE_IMAGE

 
 

-bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type,
-                        const wxPalette *palette) const
+bool wxBitmap::SaveFile( const wxString& filename,
+    wxBitmapType type, const wxPalette *palette ) const

 {
 {

+    bool success = false;

     wxBitmapHandler *handler = FindHandler(type);
 
     if ( handler )
     {
     wxBitmapHandler *handler = FindHandler(type);
 
     if ( handler )
     {

-        return handler->SaveFile(this, filename, type, palette);
+        success = handler->SaveFile(this, filename, type, palette);

     }
     else
     {
     }
     else
     {

+#if wxUSE_IMAGE

         wxImage image = ConvertToImage();
         wxImage image = ConvertToImage();

-
-        return image.SaveFile(filename, type);
+        success = image.SaveFile(filename, type);
+#else
+        wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+#endif

     }
 
     }
 

-    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
-    return false;
-}
-
-bool wxBitmap::Ok() const
-{
-   return (M_BITMAPDATA && M_BITMAPDATA->Ok());
+    return success;

 }
 
 int wxBitmap::GetHeight() const
 }
 
 int wxBitmap::GetHeight() const


@@ -941,11 +1354,6 @@ int wxBitmap::GetDepth() const
    return M_BITMAPDATA->GetDepth();
 }
 
    return M_BITMAPDATA->GetDepth();
 }
 

-int wxBitmap::GetQuality() const
-{
-    return 0;
-}
-

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


@@ -962,37 +1370,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);
 }
 
     M_BITMAPDATA->SetDepth(d);
 }
 

-void wxBitmap::SetQuality(int WXUNUSED(quality))
-{
-}
-

 void wxBitmap::SetOk(bool isOk)
 {
 void wxBitmap::SetOk(bool isOk)
 {

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

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


@@ -1006,30 +1402,26 @@ 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;
 
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 
     // Remove existing mask if there is one.
     delete M_BITMAPDATA->m_bitmapMask;
 
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 

-#if !wxMAC_USE_CORE_GRAPHICS

 WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
 {
 WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
 {

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

 }
 }

-#endif

 
 // ----------------------------------------------------------------------------
 // wxMask
 
 // ----------------------------------------------------------------------------
 // wxMask


@@ -1040,46 +1432,58 @@ 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
 // Construct a mask from a bitmap and a colour indicating
 // the transparent area

-wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
+wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )

 {
     Init() ;
 {
     Init() ;

-    Create(bitmap, colour);
+    Create( bitmap, colour );

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

-wxMask::wxMask(const wxBitmap& bitmap)
+wxMask::wxMask( const wxBitmap& bitmap )

 {
     Init() ;
 {
     Init() ;

-    Create(bitmap);
+    Create( bitmap );

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

-wxMask::wxMask(const wxMemoryBuffer& data, int width , int height , int bytesPerRow )
+
+wxMask::wxMask( const wxMemoryBuffer& data, int width , int height , int bytesPerRow )

 {
     Init() ;
 {
     Init() ;

-    Create(data, width , height , bytesPerRow );
+    Create( data, width , height , bytesPerRow );

 }
 
 wxMask::~wxMask()
 {
 }
 
 wxMask::~wxMask()
 {

-#if !wxMAC_USE_CORE_GRAPHICS

     if ( m_maskBitmap )
     {
     if ( m_maskBitmap )
     {

-        DisposeGWorld( (GWorldPtr) m_maskBitmap ) ;
+        CGContextRelease( (CGContextRef) m_maskBitmap );

         m_maskBitmap = NULL ;
     }
         m_maskBitmap = NULL ;
     }

-#endif

 }
 
 }
 

-void wxMask::Init() 
+void wxMask::Init()

 {
     m_width = m_height = m_bytesPerRow = 0 ;
 {
     m_width = m_height = m_bytesPerRow = 0 ;

-#if !wxMAC_USE_CORE_GRAPHICS

     m_maskBitmap = NULL ;
     m_maskBitmap = NULL ;

-#endif
-    

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


@@ -1087,29 +1491,41 @@ void *wxMask::GetRawAccess() const
     return m_memBuf.GetData() ;
 }
 
     return m_memBuf.GetData() ;
 }
 

-void wxMask::RealizeNative() 
+// The default ColorTable for k8IndexedGrayPixelFormat in Intel appears to be broken, so we'll use an non-indexed
+// bitmap mask instead; in order to keep the code simple, the change applies to PowerPC implementations as well
+
+void wxMask::RealizeNative()

 {
 {

-#if !wxMAC_USE_CORE_GRAPHICS

     if ( m_maskBitmap )
     {
     if ( m_maskBitmap )
     {

-       DisposeGWorld(  (GWorldPtr) m_maskBitmap ) ;
+        CGContextRelease( (CGContextRef) m_maskBitmap );

        m_maskBitmap = NULL ;
     }
        m_maskBitmap = NULL ;
     }

-    Rect rect = { 0 , 0 , m_height , m_width } ;
-    verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_maskBitmap , k8IndexedGrayPixelFormat , &rect , NULL , NULL , 0 ,
-        (char*) m_memBuf.GetData() , m_bytesPerRow ) ) ; 
-#endif
+
+    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") ) ;

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

+

 bool wxMask::Create(const wxMemoryBuffer& data,int width , int height , int bytesPerRow)
 {
     m_memBuf = data ;
     m_width = width ;
     m_height = height ;
     m_bytesPerRow = bytesPerRow ;
 bool wxMask::Create(const wxMemoryBuffer& data,int width , int height , int bytesPerRow)
 {
     m_memBuf = data ;
     m_width = width ;
     m_height = height ;
     m_bytesPerRow = bytesPerRow ;

+

     wxASSERT( data.GetDataLen() == (size_t)(height * bytesPerRow) ) ;
     wxASSERT( data.GetDataLen() == (size_t)(height * bytesPerRow) ) ;

+

     RealizeNative() ;
     RealizeNative() ;

+

     return true ;
 }
 
     return true ;
 }
 


@@ -1118,29 +1534,38 @@ 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 + 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 ) ;

+    wxASSERT( destdatabase != NULL ) ;
+

     memset( destdatabase , 0 , size ) ;
     unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
     memset( destdatabase , 0 , size ) ;
     unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;

+

     for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )
     {
     for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )
     {

-        unsigned char *destdata= destdatabase ;
-        for( int x = 0 ; x < m_width ; ++x )
+        unsigned char *destdata = destdatabase ;
+        unsigned char r, g, b;
+
+        for ( int x = 0 ; x < m_width ; ++x )

         {
             srcdata++ ;
         {
             srcdata++ ;

-            unsigned char r = *srcdata++ ;
-            unsigned char g = *srcdata++ ;
-            unsigned char b = *srcdata++ ;
+            r = *srcdata++ ;
+            g = *srcdata++ ;
+            b = *srcdata++ ;
+

             if ( ( r + g + b ) > 0x10 )
             if ( ( r + g + b ) > 0x10 )

-                *destdata++ = 0x00 ;
-            else

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

+            else
+                *destdata++ = 0x00 ;

         }
     }
         }
     }

+

     m_memBuf.UngetWriteBuf( size ) ;
     RealizeNative() ;
     m_memBuf.UngetWriteBuf( size ) ;
     RealizeNative() ;

-    return TRUE;
+
+    return true;

 }
 
 // Create a mask from a bitmap and a colour indicating
 }
 
 // Create a mask from a bitmap and a colour indicating


@@ -1149,70 +1574,63 @@ 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 + 3 ) & 0xFFFFFFC ;
-    size_t size = m_bytesPerRow * m_height ;
+    m_bytesPerRow = GetBestBytesPerRow( m_width * kMaskBytesPerPixel ) ;

 
 

+    size_t size = m_bytesPerRow * m_height ;

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

+    wxASSERT( destdatabase != NULL ) ;
+

     memset( destdatabase , 0 , size ) ;
     memset( destdatabase , 0 , size ) ;

-    unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
-    for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow)
+    unsigned char * srcdatabase = (unsigned char*) bitmap.GetRawAccess() ;
+    size_t sourceBytesRow = bitmap.GetBitmapData()->GetBytesPerRow();
+
+    for ( int y = 0 ; y < m_height ; ++y , srcdatabase+= sourceBytesRow, destdatabase += m_bytesPerRow)

     {
     {

-        unsigned char *destdata= destdatabase ;
-        for( int x = 0 ; x < m_width ; ++x )
+        unsigned char *srcdata = srcdatabase ;
+        unsigned char *destdata = destdatabase ;
+        unsigned char r, g, b;
+
+        for ( int x = 0 ; x < m_width ; ++x )

         {
             srcdata++ ;
         {
             srcdata++ ;

-            unsigned char r = *srcdata++ ;
-            unsigned char g = *srcdata++ ;
-            unsigned char b = *srcdata++ ;
-            if ( colour == wxColour( r , g , b) )
-                *destdata++ = 0x00 ;
-            else
+            r = *srcdata++ ;
+            g = *srcdata++ ;
+            b = *srcdata++ ;
+
+            if ( colour == wxColour( r , g , b ) )

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

+            else
+                *destdata++ = 0x00 ;

         }
     }
         }
     }

+

     m_memBuf.UngetWriteBuf( size ) ;
     RealizeNative() ;
     m_memBuf.UngetWriteBuf( size ) ;
     RealizeNative() ;

-    return TRUE;
+
+    return true;

 }
 
 }
 

-#if !wxMAC_USE_CORE_GRAPHICS

 WXHBITMAP wxMask::GetHBITMAP() const
 {
     return m_maskBitmap ;
 }
 WXHBITMAP wxMask::GetHBITMAP() const
 {
     return m_maskBitmap ;
 }

-#endif

 
 // ----------------------------------------------------------------------------
 // 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
 // ----------------------------------------------------------------------------
 

+#ifndef __LP64__
+

 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {
     DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler)
 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {
     DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler)

+

 public:
     inline wxPICTResourceHandler()
     {
 public:
     inline wxPICTResourceHandler()
     {


@@ -1224,11 +1642,17 @@ public:
     virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
           int desiredWidth, int desiredHeight);
 };
     virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
           int desiredWidth, int desiredHeight);
 };

+

 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 ;
     wxMacStringToPascal( name , theName ) ;
 
     Str255 theName ;
     wxMacStringToPascal( name , theName ) ;
 


@@ -1236,92 +1660,55 @@ bool  wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, lo
     if ( thePict )
     {
         wxMetafile mf ;
     if ( thePict )
     {
         wxMetafile mf ;

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

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

-        return TRUE ;
+
+        return true ;

     }
     }

-    return FALSE ;
+#endif
+
+    return false ;

 }
 }

+#endif

 
 void wxBitmap::InitStandardHandlers()
 {
 
 void wxBitmap::InitStandardHandlers()
 {

-    AddHandler(new wxPICTResourceHandler) ;
-    AddHandler(new wxICONResourceHandler) ;
+#ifndef __LP64__
+    AddHandler( new wxPICTResourceHandler ) ;
+#endif
+    AddHandler( new wxICONResourceHandler ) ;

 }
 
 // ----------------------------------------------------------------------------
 // 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() )
 {
     if ( !Ok() )

-    {

         // no bitmap, no data (raw or otherwise)
         return NULL;
         // no bitmap, no data (raw or otherwise)
         return NULL;

-    }

 
     data.m_width = GetWidth() ;
     data.m_height = GetHeight() ;
 
     data.m_width = GetWidth() ;
     data.m_height = GetHeight() ;

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

 }
 
 }
 

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

 {
 {

-    if ( !Ok() )
-        return;
-
-    // TODO : if we have some information about the API we should check
-    // this code looks strange...
-
-    if ( M_BITMAPDATA->HasAlpha() )
-    {
-        wxAlphaPixelData& data = (wxAlphaPixelData&)dataBase;
-
-        int w = data.GetWidth(),
-            h = data.GetHeight();
-
-        wxBitmap bmpMask(GetWidth(), GetHeight(), 32);
-        wxAlphaPixelData dataMask(bmpMask, data.GetOrigin(), wxSize(w, h));
-        wxAlphaPixelData::Iterator pMask(dataMask),
-                                   p(data);
-        for ( int y = 0; y < h; y++ )
-        {
-            wxAlphaPixelData::Iterator rowStartMask = pMask,
-                                       rowStart = p;
-
-            for ( int x = 0; x < w; x++ )
-            {
-                const wxAlphaPixelData::Iterator::ChannelType
-                    alpha = p.Alpha();
-
-                pMask.Red() = alpha;
-                pMask.Green() = alpha;
-                pMask.Blue() = alpha;
-
-                ++p;
-                ++pMask;
-            }
-
-            p = rowStart;
-            p.OffsetY(data, 1);
-
-            pMask = rowStartMask;
-            pMask.OffsetY(dataMask, 1);
-        }
-
-        SetMask(new wxMask(bmpMask));
-    }
+    EndRawAccess() ;

 }
 
 void wxBitmap::UseAlpha()
 {
 }
 
 void wxBitmap::UseAlpha()
 {

-    // remember that we are using alpha channel, we'll need to create a proper
-    // mask in UngetRawData()
+    // remember that we are using alpha channel:
+    // we'll need to create a proper mask in UngetRawData()

     M_BITMAPDATA->UseAlpha( true );
 }
     M_BITMAPDATA->UseAlpha( true );
 }