X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be52b34172dede7460990c54b9f7e2dad3a6f876..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/mac/carbon/bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index ddabfe2384..19334a0f7c 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -1,416 +1,881 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.cpp
+// Name:        src/mac/carbon/bitmap.cpp
 // Purpose:     wxBitmap
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "bitmap.h"
-#endif
-
-#include "wx/defs.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/rawbmp.h"
+
 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"
 
-CTabHandle wxMacCreateColorTable( int numColors )
+// 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,
+// 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
+
+class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
-    CTabHandle newColors; /* Handle to the new color table */
-    
-    /* Allocate memory for the color table */
-    newColors = (CTabHandle)NewHandleClear( sizeof (ColorTable) +
-    sizeof (ColorSpec) * (numColors - 1) );
-    if (newColors != nil)
-    {
-        /* Initialize the fields */
-        (**newColors).ctSeed = GetCTSeed();
-        (**newColors).ctFlags = 0;
-        (**newColors).ctSize = numColors - 1;
-        /* Initialize the table of colors */
-    }
-    return newColors ;
+    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);
+
+    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) );
 }
 
-void wxMacDestroyColorTable( CTabHandle colors ) 
+#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 )
 {
-    DisposeHandle( (Handle) colors ) ;
+    memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
+    if ( bitmap.Ok() )
+    {
+        wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
+        if ( bmap == NULL )
+            return ;
+
+        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->u.imageRef = (CGImageRef) bmap->CreateCGImage() ;
+        }
+        else
+        {
+#ifndef __LP64__
+            info->contentType = kControlContentPictHandle ;
+            info->u.picture = bmap->GetPictHandle() ;
+#endif
+        }
+    }
 }
 
-void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue )
+CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap )
 {
-    (**newColors).ctTable[index].value = index;
-    (**newColors).ctTable[index].rgb.red = red ; // someRedValue;
-    (**newColors).ctTable[index].rgb.green = green ; // someGreenValue;
-    (**newColors).ctTable[index].rgb.blue = blue ; // someBlueValue;
+    wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
+    if ( bmap == NULL )
+        return NULL ;
+    return (CGImageRef) bmap->CreateCGImage();
 }
 
-GWorldPtr wxMacCreateGWorld( int width , int height , int depth )
+void wxMacReleaseBitmapButton( ControlButtonContentInfo*info )
 {
-    OSErr err = noErr ;
-    GWorldPtr port ;
-    Rect rect = { 0 , 0 , height , width } ;
-    
-    if ( depth < 0 )
+    if ( info->contentType == kControlContentIconRef )
     {
-        depth = wxDisplayDepth() ;     
+        ReleaseIconRef( info->u.iconRef ) ;
     }
-        
-    err = NewGWorld( &port , depth , &rect , NULL , NULL , 0 ) ;
-    if ( err == noErr )
+    else if ( info->contentType == kControlNoContent )
     {
-        return port ;
+        // there's no bitmap at all, fall through silently
+    }
+    else if ( info->contentType == kControlContentPictHandle )
+    {
+        // owned by the bitmap, no release here
+    }
+    else if ( info->contentType == kControlContentCGImageRef )
+    {
+        CGImageRelease( info->u.imageRef ) ;
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("Unexpected bitmap type") ) ;
     }
-    return NULL ;
 }
 
-void wxMacDestroyGWorld( GWorldPtr gw )
+#endif //wxUSE_BMPBUTTON
+
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
+
+void wxBitmapRefData::Init()
 {
-    if ( gw )
-        DisposeGWorld( gw ) ;
-}
+    m_width = 0 ;
+    m_height = 0 ;
+    m_depth = 0 ;
+    m_bytesPerRow = 0;
+    m_ok = false ;
+    m_bitmapMask = NULL ;
+    m_cgImageRef = NULL ;
+
+    m_iconRef = NULL ;
+    m_pictHandle = NULL ;
+    m_hBitmap = NULL ;
 
-#define kDefaultRes 0x00480000 /* Default resolution is 72 DPI; Fixed type */
+    m_rawAccessCount = 0 ;
+    m_hasAlpha = false;
+}
 
-OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect  *bounds , CTabHandle colors )
+wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData &tocopy)
 {
-    CTabHandle newColors;       /* Color table used for the off-screen PixMap */
-    Ptr        offBaseAddr;     /* Pointer to the off-screen pixel image */
-    OSErr      error;           /* Returns error code */
-    short      bytesPerRow;     /* Number of bytes per row in the PixMap */
+    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() ;
+}
 
-    error = noErr;
-    newColors = nil;
-    offBaseAddr = nil;
+wxBitmapRefData::wxBitmapRefData( int w , int h , int d )
+{
+    Init() ;
+    Create( w , h , d ) ;
+}
 
-    bytesPerRow = ((depth * (bounds->right - bounds->left) + 31) / 32) * 4;
+bool wxBitmapRefData::Create( int w , int h , int d )
+{
+    m_width = wxMax(1, w);
+    m_height = wxMax(1, h);
+    m_depth = d ;
+    m_hBitmap = NULL ;
 
-   /* Clone the clut if indexed color; allocate a dummy clut if direct color*/
-    if (depth <= 8)
-        {
-        newColors = colors;
-        error = HandToHand((Handle *) &newColors);
-        }
-    else
-        {
-        newColors = (CTabHandle) NewHandle(sizeof(ColorTable) -
-                sizeof(CSpecArray));
-        error = MemError();
-        }
-    if (error == noErr)
-        {
-        /* Allocate pixel image; long integer multiplication avoids overflow */
-        (**icon).iconData = NewHandle((unsigned long) bytesPerRow * (bounds->bottom -
-                bounds->top));
-        if ((**icon).iconData != nil)
-            {
-            /* Initialize fields common to indexed and direct PixMaps */
-            (**icon).iconPMap.baseAddr = 0;  /* Point to image */
-            (**icon).iconPMap.rowBytes = bytesPerRow | /* MSB set for PixMap */
-                    0x8000;
-            (**icon).iconPMap.bounds = *bounds;        /* Use given bounds */
-            (**icon).iconPMap.pmVersion = 0;           /* No special stuff */
-            (**icon).iconPMap.packType = 0;            /* Default PICT pack */
-            (**icon).iconPMap.packSize = 0;            /* Always zero in mem */
-            (**icon).iconPMap.hRes = kDefaultRes;      /* 72 DPI default res */
-            (**icon).iconPMap.vRes = kDefaultRes;      /* 72 DPI default res */
-            (**icon).iconPMap.pixelSize = depth;       /* Set # bits/pixel */
-
-            /* Initialize fields specific to indexed and direct PixMaps */
-            if (depth <= 8)
-                {
-                /* PixMap is indexed */
-                (**icon).iconPMap.pixelType = 0;       /* Indicates indexed */
-                (**icon).iconPMap.cmpCount = 1;        /* Have 1 component */
-                (**icon).iconPMap.cmpSize = depth;     /* Component size=depth */
-                (**icon).iconPMap.pmTable = newColors; /* Handle to CLUT */
-                }
-            else
-                {
-                /* PixMap is direct */
-                (**icon).iconPMap.pixelType = RGBDirect; /* Indicates direct */
-                (**icon).iconPMap.cmpCount = 3;          /* Have 3 components */
-                if (depth == 16)
-                    (**icon).iconPMap.cmpSize = 5;       /* 5 bits/component */
-                else
-                    (**icon).iconPMap.cmpSize = 8;       /* 8 bits/component */
-                (**newColors).ctSeed = 3 * (**icon).iconPMap.cmpSize;
-                (**newColors).ctFlags = 0;
-                (**newColors).ctSize = 0;
-                (**icon).iconPMap.pmTable = newColors;
-                }
-            }
-        else
-            error = MemError();
-        }
-    else
-        newColors = nil;
+    m_bytesPerRow = GetBestBytesPerRow( w * 4 ) ;
+    size_t size = m_bytesPerRow * h ;
+    void* data = m_memBuf.GetWriteBuf( size ) ;
+    if ( data != NULL )
+    {
+        memset( data , 0 , size ) ;
+        m_memBuf.UngetWriteBuf( size ) ;
 
-    /* If no errors occured, return a handle to the new off-screen PixMap */
-    if (error != noErr)
-        {
-        if (newColors != nil)
-            DisposeCTable(newColors);
-        }
+        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 ) ;
 
-    /* Return the error code */
-    return error;
+    return m_ok ;
 }
 
-CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  )
+void wxBitmapRefData::UseAlpha( bool use )
 {
-    GWorldPtr       saveWorld;
-    GDHandle        saveHandle;
+    if ( m_hasAlpha == use )
+        return ;
 
-    GetGWorld(&saveWorld,&saveHandle);      // save Graphics env state
-    SetGWorld(image,nil);
+    m_hasAlpha = use ;
 
-    Rect frame = { 0 , 0 , iconSize , iconSize } ;
-    Rect imageBounds = frame ;
-    GetPortBounds( image , &imageBounds ) ;
+    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 );
+}
 
-    int bwSize = iconSize / 8 * iconSize ;
-    CIconHandle icon = (CIconHandle) NewHandleClear( sizeof ( CIcon ) + 2 * bwSize) ;
-    HLock((Handle)icon) ;
-    SetupCIconHandlePixMap( icon , dstDepth , &frame,GetCTable(dstDepth)) ;
-    HLock( (**icon).iconData ) ;
-    (**icon).iconPMap.baseAddr = *(**icon).iconData ;
+void *wxBitmapRefData::GetRawAccess() const
+{
+    wxCHECK_MSG( IsOk(), NULL , wxT("invalid bitmap") ) ;
+    return m_memBuf.GetData() ;
+}
 
-    LockPixels(GetGWorldPixMap(image));
-            
-    CopyBits(GetPortBitMapForCopyBits(image),
-                (BitMapPtr)&((**icon).iconPMap),
-                &imageBounds,
-                &imageBounds,
-                srcCopy | ditherCopy, nil);
- 
- 
-    UnlockPixels(GetGWorldPixMap(image));
-    HUnlock( (**icon).iconData ) ;
-    
-    (**icon).iconMask.rowBytes = iconSize / 8 ;
-    (**icon).iconMask.bounds = frame ;
+void *wxBitmapRefData::BeginRawAccess()
+{
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid bitmap") ) ;
+    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") ) ;
 
-    (**icon).iconBMap.rowBytes = iconSize / 8 ;
-    (**icon).iconBMap.bounds = frame ;
-    (**icon).iconMask.baseAddr = (char*) &(**icon).iconMaskData ;
-    (**icon).iconBMap.baseAddr = (char*) &(**icon).iconMaskData + bwSize ;
+    ++m_rawAccessCount ;
 
-    if ( mask )
-    {
-      LockPixels(GetGWorldPixMap(mask) ) ;
-      CopyBits(GetPortBitMapForCopyBits(mask) ,
-          &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
-      CopyBits(GetPortBitMapForCopyBits(mask) ,
-          &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
-      UnlockPixels(GetGWorldPixMap( mask ) ) ;
-    }
-    else
+    // we must destroy an existing cached image, as
+    // the bitmap data may change now
+    if ( m_cgImageRef )
     {
-        LockPixels(GetGWorldPixMap(image));
-      CopyBits(GetPortBitMapForCopyBits(image) ,
-          &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
-      CopyBits(GetPortBitMapForCopyBits(image) ,
-          &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
-        UnlockPixels(GetGWorldPixMap(image));
+        CGImageRelease( m_cgImageRef ) ;
+        m_cgImageRef = NULL ;
     }
-    
-    (**icon).iconMask.baseAddr = NULL ;
-    (**icon).iconBMap.baseAddr = NULL ;
-    (**icon).iconPMap.baseAddr = NULL ;
-    HUnlock((Handle)icon) ;
-    SetGWorld(saveWorld,saveHandle);
-    
-    return icon;
+
+    return m_memBuf.GetData() ;
 }
 
-PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
+void wxBitmapRefData::EndRawAccess()
 {
-  CGrafPtr       origPort ;
-  GDHandle       origDev ;
+    wxCHECK_RET( IsOk() , wxT("invalid bitmap") ) ;
+    wxASSERT( m_rawAccessCount == 1 ) ;
 
-  PicHandle      pict;         
-
-  RGBColor       white = { 0xffff ,0xffff , 0xffff } ;
-  RGBColor       black = { 0x0000 ,0x0000 , 0x0000 } ;
+    --m_rawAccessCount ;
+}
 
-  GetGWorld( &origPort , &origDev ) ;
+bool wxBitmapRefData::HasNativeSize()
+{
+    int w = GetWidth() ;
+    int h = GetHeight() ;
+    int sz = wxMax( w , h ) ;
 
-  RgnHandle clipRgn = NULL ;
+    return ( sz == 128 || sz == 48 || sz == 32 || sz == 16 );
+}
 
-  if ( mask )
-  {
-    clipRgn = NewRgn() ;
-    LockPixels( GetGWorldPixMap( mask ) ) ;
-    BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( mask ) ) ;
-    UnlockPixels( GetGWorldPixMap( mask ) ) ;
-  }
-    
-  SetGWorld( wp , NULL ) ;
-  Rect portRect ;
-  GetPortBounds( wp , &portRect ) ;
-
-  pict = OpenPicture(&portRect);   
-  if(pict)  
-  {
-    RGBForeColor( &black ) ;
-    RGBBackColor( &white ) ;
-
-    LockPixels( GetGWorldPixMap( wp ) ) ;
-    CopyBits(GetPortBitMapForCopyBits(wp),          
-            GetPortBitMapForCopyBits(wp),       
-            &portRect,          
-            &portRect,          
-            srcCopy,clipRgn);       
-    UnlockPixels( GetGWorldPixMap( wp ) ) ;
-    ClosePicture();                 
-  }
-  SetGWorld( origPort , origDev ) ;
-  return pict;                  
-}
-
-void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap ) 
+IconRef wxBitmapRefData::GetIconRef()
 {
-    memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
-    if ( bitmap.Ok() )
+    if ( m_iconRef == NULL )
     {
-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ;
-        if ( bmap == NULL )
-            return ;
-            
-        if ( bmap->m_bitmapType == kMacBitmapTypePict )
-        {
-            info->contentType = kControlContentPictHandle ;
-            info->u.picture = MAC_WXHMETAFILE(bmap->m_hPict) ;
-        }
-        else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
+        // 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)
         {
-            if ( (bmap->m_width == bmap->m_height) && (bmap->m_width & 0x3 == 0) )
-            {
-                info->contentType = kControlContentCIconHandle ;
-                if ( bitmap.GetMask() )
+            case 128:
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+                if ( UMAGetSystemVersion() >= 0x1050 )
                 {
-                    info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap()) ,
-                                                           8 , bmap->m_width ) ;
+                    dataType = kIconServices128PixelDataARGB ;
                 }
                 else
+#endif
                 {
-                    info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
-                                                           8 , bmap->m_width ) ;
+                    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;
+        }
+
+        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
+                            // 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
             {
-                info->contentType = kControlContentPictHandle ;
-                if ( bitmap.GetMask() )
-                {
-				    info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap() ) ) ;
-               }
-                else
+                // 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 )
                 {
-				    info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ) ;
+                    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 if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
-		{
-	        info->contentType = kControlContentCIconHandle ;
-	        info->u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
-		}
+        else
+        {
+            PicHandle pic = GetPictHandle() ;
+            SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
+        }
+        // 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") );
     }
+
+    return m_iconRef ;
 }
 
-wxBitmapRefData::wxBitmapRefData()
-    : m_width(0)
-    , m_height(0)
-    , m_depth(0)
-    , m_ok(FALSE)
-    , m_numColors(0)
-    , m_quality(0)
-{
-    m_bitmapMask = NULL;
-    m_hBitmap = NULL ;
-    m_hPict = NULL ;
-    m_hIcon = NULL ;
-    m_bitmapType = kMacBitmapTypeUnknownType ;
+PicHandle wxBitmapRefData::GetPictHandle()
+{
+    if ( m_pictHandle == NULL )
+    {
+#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 = 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_pictHandle ;
 }
 
-// TODO move this to a public function of Bitmap Ref
-static void DisposeBitmapRefData(wxBitmapRefData *data)
+CGImageRef wxBitmapRefData::CreateCGImage() const
 {
-    switch (data->m_bitmapType)
+    wxASSERT( m_ok ) ;
+    wxASSERT( m_rawAccessCount >= 0 ) ;
+    CGImageRef image ;
+    if ( m_rawAccessCount > 0 || m_cgImageRef == NULL )
     {
-        case kMacBitmapTypePict :
+        if ( m_depth != 1 && m_bitmapMask == NULL )
+        {
+            if ( m_bitmapMask )
+            {
+                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 ( data->m_hPict )
+                if ( m_hasAlpha )
                 {
-                    KillPicture( MAC_WXHMETAFILE( data->m_hPict ) ) ;
-                    data->m_hPict = NULL ;
+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+                    alphaInfo = kCGImageAlphaPremultipliedFirst ;
+#else
+                    alphaInfo = kCGImageAlphaFirst ;
+#endif
                 }
+
+                membuf = m_memBuf;
             }
-            break ;
-        case kMacBitmapTypeGrafWorld :
+
+            CGDataProviderRef dataProvider = NULL ;
+            if ( m_depth == 1 )
             {
-                if ( data->m_hBitmap )
+                // 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 )
                 {
-                    wxMacDestroyGWorld( MAC_WXHBITMAP(data->m_hBitmap) ) ;
-                    data->m_hBitmap = NULL ;
+                    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 );
             }
-            break ;
-        case kMacBitmapTypeIcon :
-            if ( data->m_hIcon )
+            else
             {
-                DisposeCIcon( MAC_WXHICON(data->m_hIcon) ) ;
-                data->m_hIcon = NULL ;
+                CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
+                dataProvider = wxMacCGDataProviderCreateWithMemoryBuffer( membuf );
+                image =
+                    ::CGImageCreate(
+                                    w, h, 8 , 32 , m_bytesPerRow , colorSpace, alphaInfo ,
+                                    dataProvider, NULL , false , kCGRenderingIntentDefault );
             }
-        
-        default :
-            // unkown type ?
-            break ;
+            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 ;
+}
+
+CGContextRef wxBitmapRefData::GetBitmapContext() const
+{
+    return m_hBitmap;
+}
+
+void wxBitmapRefData::Free()
+{
+    wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ;
+
+    if ( m_cgImageRef )
+    {
+        CGImageRelease( m_cgImageRef ) ;
+        m_cgImageRef = NULL ;
+    }
+
+    if ( m_iconRef )
+    {
+        ReleaseIconRef( m_iconRef ) ;
+        m_iconRef = NULL ;
+    }
+
+#ifndef __LP64__
+    if ( m_pictHandle )
+    {
+        KillPicture( m_pictHandle ) ;
+        m_pictHandle = NULL ;
+    }
+#endif
+
+    if ( m_hBitmap )
+    {
+        CGContextRelease(m_hBitmap);
+        m_hBitmap = NULL ;
+    }
+
+    if (m_bitmapMask)
+    {
+        delete m_bitmapMask;
+        m_bitmapMask = NULL;
     }
-    
-  if (data->m_bitmapMask)
-  {
-    delete data->m_bitmapMask;
-    data->m_bitmapMask = NULL;
-  }
 }
 
 wxBitmapRefData::~wxBitmapRefData()
 {
-  DisposeBitmapRefData( this ) ;
+    Free() ;
 }
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
-    Ref(icon) ;
+    bool created = false ;
+    int w = icon.GetWidth() ;
+    int h = icon.GetHeight() ;
+
+    Create( icon.GetWidth() , icon.GetHeight() ) ;
+
+    if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) )
+    {
+        IconFamilyHandle iconFamily = NULL ;
+        Handle imagehandle = NewHandle( 0 ) ;
+        Handle maskhandle = NewHandle( 0 ) ;
+
+        OSType maskType = 0;
+        OSType dataType = 0;
+        IconSelectorValue selector = 0 ;
+
+        switch (w)
+        {
+            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 )
+            {
+                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 ;
+        }
+
+        DisposeHandle( (Handle) iconFamily ) ;
+    }
+
+    if ( !created )
+    {
+        wxMemoryDC dc ;
+        dc.SelectObject( *this ) ;
+        dc.DrawIcon( icon , 0 , 0 ) ;
+        dc.SelectObject( wxNullBitmap ) ;
+    }
+
     return true;
 }
 
 wxBitmap::wxBitmap()
 {
-    m_refData = NULL;
 }
 
 wxBitmap::~wxBitmap()
@@ -419,63 +884,56 @@ wxBitmap::~wxBitmap()
 
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 {
-    m_refData = new wxBitmapRefData;
+    wxBitmapRefData* bitmapRefData;
 
-    M_BITMAPDATA->m_width = the_width ;
-    M_BITMAPDATA->m_height = the_height ;
-    M_BITMAPDATA->m_depth = no_bits ;
-    M_BITMAPDATA->m_numColors = 0;
-    if ( no_bits == 1 )
+    m_refData = bitmapRefData = new wxBitmapRefData( the_width , the_height , no_bits ) ;
+
+    if (bitmapRefData->IsOk())
     {
-        M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
-        MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
-        M_BITMAPDATA->m_ok = (MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) != NULL ) ;
-    
-        CGrafPtr    origPort ;
-        GDHandle    origDevice ;
-    
-        GetGWorld( &origPort , &origDevice ) ;
-        SetGWorld( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) , NULL ) ;
-        LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) ) ) ;
-    
-        // bits is a char array
-    
-        unsigned char* linestart = (unsigned char*) bits ;
-        int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
-        if ( the_width % (sizeof(unsigned char) * 8) ) {
-            linesize += sizeof(unsigned char);
-        }
-    
-        RGBColor colors[2] = { 
-            { 0xFFFF , 0xFFFF , 0xFFFF } ,
-            { 0, 0 , 0 } 
-        } ;
-    
-        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 )
-                {
-                    SetCPixel( x , y , &colors[1] ) ;
-                }
-                else
+                unsigned char* destination = destptr;
+                int index, bit, mask;
+
+                for ( int x = 0 ; x < the_width ; ++x )
                 {
-                    SetCPixel( x , y , &colors[0] ) ;
+                    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() ;
         }
-        UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) ) ) ;
-    
-        SetGWorld( origPort , origDevice ) ;
-    }
-    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)
@@ -483,7 +941,7 @@ wxBitmap::wxBitmap(int w, int h, int 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);
 }
@@ -493,144 +951,130 @@ wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
     LoadFile(filename, type);
 }
 
-bool wxBitmap::CreateFromXpm(const char **bits)
+wxGDIRefData* wxBitmap::CreateGDIRefData() const
+{
+    return new wxBitmapRefData;
+}
+
+wxGDIRefData* wxBitmap::CloneGDIRefData(const wxGDIRefData* data) const
+{
+    return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
+}
+
+void * wxBitmap::GetRawAccess() const
+{
+    wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
+
+    return M_BITMAPDATA->GetRawAccess() ;
+}
+
+void * wxBitmap::BeginRawAccess()
+{
+    wxCHECK_MSG( Ok() , NULL , wxT("invalid bitmap") ) ;
+
+    return M_BITMAPDATA->BeginRawAccess() ;
+}
+
+void wxBitmap::EndRawAccess()
+{
+    wxCHECK_RET( Ok() , wxT("invalid bitmap") ) ;
+
+    M_BITMAPDATA->EndRawAccess() ;
+}
+
+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() ;
 }
 
-wxBitmap::wxBitmap(const char **bits)
+IconRef wxBitmap::GetIconRef() const
 {
-    (void) CreateFromXpm(bits);
+    wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
+
+    return M_BITMAPDATA->GetIconRef() ;
 }
 
-wxBitmap::wxBitmap(char **bits)
+IconRef wxBitmap::CreateIconRef() const
 {
-    (void) CreateFromXpm((const char **)bits);
+    IconRef icon = GetIconRef();
+    verify_noerr( AcquireIconRef(icon) );
+    return icon;
 }
 
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 {
-   wxCHECK_MSG( Ok() &&
+    wxCHECK_MSG( Ok() &&
                 (rect.x >= 0) && (rect.y >= 0) &&
                 (rect.x+rect.width <= GetWidth()) &&
                 (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") );
-
-   GWorldPtr origPort;
-   GDHandle  origDevice;
-
-   GetGWorld( &origPort, &origDevice );
-
-   // Update the subbitmaps reference data
-   wxBitmapRefData *ref = (wxBitmapRefData *)ret.GetRefData();
-
-   ref->m_numColors     = M_BITMAPDATA->m_numColors;
-   ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette;
-   ref->m_bitmapType    = M_BITMAPDATA->m_bitmapType;
-
-   // Copy sub region of this bitmap
-   if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict)
-   {
-       printf("GetSubBitmap:  Copy a region of a Pict structure - TODO\n");
-   }
-   else if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypeGrafWorld)
-   {
-       // Copy mask
-       if(GetMask())
-       {
-           GWorldPtr submask, mask;
-           RGBColor  color;
-
-           mask = (GWorldPtr) GetMask()->GetMaskBitmap();
-           submask = wxMacCreateGWorld(rect.width, rect.height, 1);
-           LockPixels(GetGWorldPixMap(mask));
-           LockPixels(GetGWorldPixMap(submask));
-
-           for(int yy = 0; yy < rect.height; yy++)
-           {
-               for(int xx = 0; xx < rect.width; xx++)
-               {
-                   SetGWorld(mask, NULL);
-                   GetCPixel(rect.x + xx, rect.y + yy, &color);
-                   SetGWorld(submask, NULL);
-                   SetCPixel(xx,yy, &color);
-               }
-           }
-           UnlockPixels(GetGWorldPixMap(mask));
-           UnlockPixels(GetGWorldPixMap(submask));
-           ref->m_bitmapMask = new wxMask;
-           ref->m_bitmapMask->SetMaskBitmap(submask);
-       }
-
-       // Copy bitmap
-       if(GetHBITMAP())
-       {
-           GWorldPtr subbitmap, bitmap;
-           RGBColor  color;
-
-           bitmap = (GWorldPtr) GetHBITMAP();
-           subbitmap = (GWorldPtr) ref->m_hBitmap ;
-           LockPixels(GetGWorldPixMap(bitmap));
-           LockPixels(GetGWorldPixMap(subbitmap));
-
-           for(int yy = 0; yy < rect.height; yy++)
-           {
-               for(int xx = 0; xx < rect.width; xx++)
-               {
-                   SetGWorld(bitmap, NULL);
-                   GetCPixel(rect.x + xx, rect.y + yy, &color);
-                   SetGWorld(subbitmap, NULL);
-                   SetCPixel(xx, yy, &color);
-               }
-           }
-           UnlockPixels(GetGWorldPixMap(bitmap));
-           UnlockPixels(GetGWorldPixMap(subbitmap));
-       }
-   }
-   SetGWorld( origPort, origDevice );
-
-   return ret;
-}
+    wxBitmap ret( rect.width, rect.height, GetDepth() );
+    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
-bool wxBitmap::Create(int w, int h, int d)
-{
-    UnRef();
+    int destwidth = rect.width ;
+    int destheight = rect.height ;
 
-    m_refData = new wxBitmapRefData;
+    {
+        unsigned char *sourcedata = (unsigned char*) GetRawAccess() ;
+        unsigned char *destdata = (unsigned char*) ret.BeginRawAccess() ;
+        wxASSERT( (sourcedata != NULL) && (destdata != NULL) ) ;
 
-    M_BITMAPDATA->m_width = w;
-    M_BITMAPDATA->m_height = h;
-    M_BITMAPDATA->m_depth = d;
+        int sourcelinesize = GetBitmapData()->GetBytesPerRow() ;
+        int destlinesize = ret.GetBitmapData()->GetBytesPerRow() ;
+        unsigned char *source = sourcedata + rect.x * 4 + rect.y * sourcelinesize ;
+        unsigned char *dest = destdata ;
 
-    M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
-    M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( w , h , d ) ;
-    M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hBitmap != NULL ) ;
-    return M_BITMAPDATA->m_ok;
-}
+        for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+        {
+            memcpy( dest , source , destlinesize ) ;
+        }
+    }
 
-int wxBitmap::GetBitmapType() const
-{
-   wxCHECK_MSG( Ok(), kMacBitmapTypeUnknownType, wxT("invalid bitmap") );
+    ret.EndRawAccess() ;
+
+    if ( M_BITMAPDATA->m_bitmapMask )
+    {
+        wxMemoryBuffer maskbuf ;
+        int rowBytes = GetBestBytesPerRow( destwidth * kMaskBytesPerPixel );
+        size_t maskbufsize = rowBytes * destheight ;
+
+        int sourcelinesize = M_BITMAPDATA->m_bitmapMask->GetBytesPerRow() ;
+        int destlinesize = rowBytes ;
+
+        unsigned char *source = (unsigned char *) M_BITMAPDATA->m_bitmapMask->GetRawAccess() ;
+        unsigned char *destdata = (unsigned char * ) maskbuf.GetWriteBuf( maskbufsize ) ;
+        wxASSERT( (source != NULL) && (destdata != NULL) ) ;
+
+        source += rect.x * kMaskBytesPerPixel + rect.y * sourcelinesize ;
+        unsigned char *dest = destdata ;
+
+        for (int yy = 0; yy < destheight; ++yy, source += sourcelinesize , dest += destlinesize)
+        {
+            memcpy( dest , source , destlinesize ) ;
+        }
+
+        maskbuf.UngetWriteBuf( maskbufsize ) ;
+        ret.SetMask( new wxMask( maskbuf , destwidth , destheight , rowBytes ) ) ;
+    }
+    else if ( HasAlpha() )
+        ret.UseAlpha() ;
 
-   return M_BITMAPDATA->m_bitmapType;
+    return ret;
 }
 
-void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
+bool wxBitmap::Create(int w, int h, int d)
 {
-    DisposeBitmapRefData( M_BITMAPDATA ) ;
-    
-    M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
-    M_BITMAPDATA->m_hBitmap = bmp ;
-      M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hBitmap != NULL ) ;
+    UnRef();
+
+    if ( d < 0 )
+        d = wxDisplayDepth() ;
+
+    m_refData = new wxBitmapRefData( w , h , d );
+
+    return M_BITMAPDATA->IsOk() ;
 }
 
 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
@@ -647,17 +1091,23 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
     }
     else
     {
+#if wxUSE_IMAGE
         wxImage loadimage(filename, type);
-        if (loadimage.Ok()) {
+        if (loadimage.Ok())
+        {
             *this = loadimage;
+
             return true;
         }
+#endif
     }
-    wxLogWarning("no bitmap handler for type %d defined.", type);
+
+    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+
     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();
 
@@ -665,95 +1115,94 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int
 
     wxBitmapHandler *handler = FindHandler(type);
 
-    if ( handler == NULL ) {
-        wxLogWarning("no bitmap handler for type %d defined.", type);
+    if ( handler == NULL )
+    {
+        wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
 
-        return FALSE;
+        return false;
     }
 
     return handler->Create(this, data, type, width, height, depth);
 }
 
+#if wxUSE_IMAGE
+
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
-    wxCHECK_RET( image.Ok(), wxT("invalid image") )
-    wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") )
+    wxCHECK_RET( image.Ok(), wxT("invalid image") );
 
-    m_refData = new wxBitmapRefData();
-      
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
     int height = image.GetHeight();
 
-    // Create picture
-
-    Create( width , height , 32 ) ;
+    wxBitmapRefData* bitmapRefData;
     
-    CGrafPtr origPort ;
-    GDHandle origDevice ;
-
-    PixMapHandle pixMap = GetGWorldPixMap((GWorldPtr)GetHBITMAP()) ;
-    LockPixels( pixMap );
+    m_refData = bitmapRefData = new wxBitmapRefData( width , height , depth ) ;
 
-    GetGWorld( &origPort , &origDevice ) ;
-    SetGWorld( (GWorldPtr) GetHBITMAP() , NULL ) ;
-    
-    // Render image
-    register unsigned char* data = image.GetData();
-    char* destinationBase = GetPixBaseAddr( pixMap );
-    register unsigned char* destination = (unsigned char*) destinationBase ;
-    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() )
         {
-            *destination++ = 0 ;
-            *destination++ = *data++ ;              
-            *destination++ = *data++ ;              
-            *destination++ = *data++ ;              
+            // takes precedence, don't mix with alpha info
         }
-        destinationBase += ((**pixMap).rowBytes & 0x7fff);  
-        destination = (unsigned char*) destinationBase ;    
-    }  
-    if ( image.HasMask() )
-    {
-      data = image.GetData(); 
-      
-      wxColour maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
-      RGBColor white = { 0xffff, 0xffff, 0xffff };
-      RGBColor black = { 0     , 0     , 0      };
-      wxBitmap maskBitmap ;
-
-      maskBitmap.Create( width, height, 1);
-      LockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
-      SetGWorld( (GWorldPtr) maskBitmap.GetHBITMAP(), NULL);
-
-      for (int y = 0; y < height; y++)
-      {
-          for (int x = 0; x < width; x++)
-          {
-              if ( data[0] == image.GetMaskRed() && data[1] == image.GetMaskGreen() && data[2] == image.GetMaskBlue() )
-              {
-                SetCPixel(x,y, &white);
-              }
-              else {
-                      SetCPixel(x,y, &black);
-              }
-              data += 3 ;
-          }
-      }  // for height
-      SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);
-      SetMask(new wxMask( maskBitmap ));
-      UnlockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
-    }
-    
-    UnlockPixels( GetGWorldPixMap( (GWorldPtr) GetHBITMAP()) );
-    SetGWorld( origPort, origDevice );
+        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++)
+            {
+                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() ;
+        }
+        if ( image.HasMask() )
+            SetMask( new wxMask( *this , wxColour( image.GetMaskRed() , image.GetMaskGreen() , image.GetMaskBlue() ) ) ) ;
+    } /* bitmapRefData->IsOk() */
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
-    
+
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     // create an wxImage object
@@ -762,112 +1211,147 @@ wxImage wxBitmap::ConvertToImage() const
     image.Create( width, height );
 
     unsigned char *data = image.GetData();
-
     wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
 
-    GWorldPtr origPort;
-    GDHandle  origDevice;
-    int      index;
-    RGBColor color;
-    // background color set to RGB(16,16,16) in consistent with wxGTK
-    unsigned char mask_r=16, mask_g=16, mask_b=16;
-    SInt16   r,g,b;
-    wxMask  *mask = GetMask();
-
-    GetGWorld( &origPort, &origDevice );
-    LockPixels(GetGWorldPixMap( (GWorldPtr) GetHBITMAP()));
-    SetGWorld(  (GWorldPtr) GetHBITMAP(), NULL);
-
-    // Copy data into image
-    index = 0;
-    for (int yy = 0; yy < height; yy++)
+    unsigned char* sourcestart = (unsigned char*) GetRawAccess() ;
+
+    bool hasAlpha = false ;
+    bool hasMask = false ;
+    int maskBytesPerRow = 0 ;
+    unsigned char *alpha = NULL ;
+    unsigned char *mask = NULL ;
+
+    if ( HasAlpha() )
+        hasAlpha = true ;
+
+    if ( GetMask() )
+    {
+        hasMask = true ;
+        mask = (unsigned char*) GetMask()->GetRawAccess() ;
+        maskBytesPerRow = GetMask()->GetBytesPerRow() ;
+    }
+
+    if ( hasAlpha )
+    {
+        image.SetAlpha() ;
+        alpha = image.GetAlpha() ;
+    }
+
+    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
+    // 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;
+
+    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++)
         {
-            GetCPixel(xx,yy, &color);
-            r = ((color.red ) >> 8);
-            g = ((color.green ) >> 8);
-            b = ((color.blue ) >> 8);
-            data[index    ] = r;
-            data[index + 1] = g;
-            data[index + 2] = b;
-            if (mask)
+            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 ( *maskp++ == 0xFF )
+                {
+                    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 )
             {
-                if (mask->PointMasked(xx,yy))
+                *alpha++ = a ;
+#if wxMAC_USE_PREMULTIPLIED_ALPHA
+                // this must be non-premultiplied data
+                if ( a != 0xFF && a!= 0 )
                 {
-                    data[index    ] = mask_r;
-                    data[index + 1] = mask_g;
-                    data[index + 2] = mask_b;
+                    r = r * 255 / a;
+                    g = g * 255 / a;
+                    b = b * 255 / a;
                 }
+#endif
             }
+
+            data[index    ] = r ;
+            data[index + 1] = g ;
+            data[index + 2] = b ;
+
             index += 3;
+            source += 4 ;
         }
     }
-    if (mask)
-    {
-        image.SetMaskColour( mask_r, mask_g, mask_b );
-        image.SetMask( true );
-    }
 
-    // Free resources
-    UnlockPixels(GetGWorldPixMap( (GWorldPtr) GetHBITMAP()));
-    SetGWorld(origPort, origDevice);
+    if ( hasMask )
+        image.SetMaskColour( MASK_RED, MASK_GREEN, MASK_BLUE );
 
     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 )
     {
-        return handler->SaveFile(this, filename, type, palette);
+        success = handler->SaveFile(this, filename, type, palette);
     }
     else
     {
+#if wxUSE_IMAGE
         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("no bitmap handler for type %d defined.", type);
-    return false;
-}
 
-bool wxBitmap::Ok() const
-{
-   return (M_BITMAPDATA && M_BITMAPDATA->m_ok);
+    return success;
 }
 
 int wxBitmap::GetHeight() const
 {
    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
-   return M_BITMAPDATA->m_height;
+   return M_BITMAPDATA->GetHeight();
 }
 
 int wxBitmap::GetWidth() const
 {
    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
-   return M_BITMAPDATA->m_width;
+   return M_BITMAPDATA->GetWidth() ;
 }
 
 int wxBitmap::GetDepth() const
 {
    wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 
-   return M_BITMAPDATA->m_depth;
-}
-
-int wxBitmap::GetQuality() const
-{
-   wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
-
-   return M_BITMAPDATA->m_quality;
+   return M_BITMAPDATA->GetDepth();
 }
 
 wxMask *wxBitmap::GetMask() const
@@ -877,46 +1361,38 @@ wxMask *wxBitmap::GetMask() const
    return M_BITMAPDATA->m_bitmapMask;
 }
 
-void wxBitmap::SetWidth(int w)
+bool wxBitmap::HasAlpha() const
 {
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
+   wxCHECK_MSG( Ok(), false , wxT("invalid bitmap") );
 
-    M_BITMAPDATA->m_width = w;
+   return M_BITMAPDATA->HasAlpha() ;
 }
 
-void wxBitmap::SetHeight(int h)
+void wxBitmap::SetWidth(int w)
 {
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
-    M_BITMAPDATA->m_height = h;
+    AllocExclusive();
+    M_BITMAPDATA->SetWidth(w);
 }
 
-void wxBitmap::SetDepth(int d)
+void wxBitmap::SetHeight(int h)
 {
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
-    M_BITMAPDATA->m_depth = d;
+    AllocExclusive();
+    M_BITMAPDATA->SetHeight(h);
 }
 
-void wxBitmap::SetQuality(int q)
+void wxBitmap::SetDepth(int d)
 {
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
-    M_BITMAPDATA->m_quality = q;
+    AllocExclusive();
+    M_BITMAPDATA->SetDepth(d);
 }
 
 void wxBitmap::SetOk(bool isOk)
 {
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
-    M_BITMAPDATA->m_ok = isOk;
+    AllocExclusive();
+    M_BITMAPDATA->SetOk(isOk);
 }
 
+#if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
    wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap  GetPalette()") );
@@ -926,359 +1402,313 @@ wxPalette *wxBitmap::GetPalette() const
 
 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)
 {
-    if (!M_BITMAPDATA)
-        m_refData = new wxBitmapRefData;
-
+    AllocExclusive();
     // Remove existing mask if there is one.
-    if (M_BITMAPDATA->m_bitmapMask)
-        delete M_BITMAPDATA->m_bitmapMask;
+    delete M_BITMAPDATA->m_bitmapMask;
 
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 
-WXHBITMAP wxBitmap::GetHBITMAP() const
+WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
 {
-   wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
+    wxUnusedVar(mask);
 
-   return MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap);
+    return WXHBITMAP(M_BITMAPDATA->GetBitmapContext());
 }
 
-WXHMETAFILE wxBitmap::GetPict() const
-{
-   wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
-   
-   PicHandle picture;       // This is the returned picture
-
-   // If bitmap already in Pict format return pointer
-   if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict) {
-       return M_BITMAPDATA->m_hPict;
-   }
-   else if(M_BITMAPDATA->m_bitmapType != kMacBitmapTypeGrafWorld) {
-       // Invalid bitmap
-       return NULL;
-   }
-
-   RGBColor  gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
-   RGBColor  white = { 0xffff ,0xffff , 0xffff } ;
-   RGBColor  black = { 0x0000 ,0x0000 , 0x0000 } ;
-   CGrafPtr  origPort;
-   GDHandle  origDev ;
-   wxMask   *mask;
-   Rect      portRect ;
-
-   GetPortBounds(  (GWorldPtr) GetHBITMAP() , &portRect ) ;
-   int width = portRect.right - portRect.left ;
-   int height = portRect.bottom - portRect.top ;
-
-   LockPixels( GetGWorldPixMap(  (GWorldPtr) GetHBITMAP() ) ) ;
-   GetGWorld( &origPort , &origDev ) ;
-
-   mask = GetMask();
-
-   SetGWorld(  (GWorldPtr) GetHBITMAP() , NULL ) ;
-
-   picture = OpenPicture(&portRect);   // open a picture, this disables drawing
-   if(!picture) {
-       return NULL;
-   }
-
-   if( mask )
-   {
-#ifdef __DARWIN__
-       RGBColor trans = white;
-#else
-       RGBBackColor( &gray );
-       EraseRect( &portRect );
-       RGBColor trans = gray;
-#endif
-       RGBForeColor( &black ) ;
-       RGBBackColor( &white ) ;
-       PenMode(transparent);
-
-       for ( int y = 0 ; y < height ; ++y )
-       {
-           for( int x = 0 ; x < width ; ++x )
-           {
-               if ( !mask->PointMasked(x,y) )
-               {
-                   RGBColor col ;
-
-                   GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-                   SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-               }
-               else {
-                   // With transparency this sets a blank pixel
-                   SetCPixel( x + portRect.left , y + portRect.top , &trans);
-               }
-           }
-       }
-   }
-   else
-   {
-       RGBBackColor( &gray ) ;
-       EraseRect(&portRect);
-       RGBForeColor( &black ) ;
-       RGBBackColor( &white ) ;
-
-       CopyBits(GetPortBitMapForCopyBits( (GWorldPtr) GetHBITMAP()), 
-                // src PixMap - we copy image over itself -
-                GetPortBitMapForCopyBits( (GWorldPtr) GetHBITMAP()),
-                //  dst PixMap - no drawing occurs
-                &portRect,    // srcRect - it will be recorded and compressed -
-                &portRect,    // dstRect - into the picture that is open -
-                srcCopy,NULL); // copyMode and no clip region
-   }
-   ClosePicture();                  // We are done recording the picture
-   UnlockPixels( GetGWorldPixMap(  (GWorldPtr) GetHBITMAP() ) ) ;
-   SetGWorld( origPort , origDev ) ;
-
-   return picture;                  // return our groovy pict handle
-}
-
-/*
- * wxMask
- */
+// ----------------------------------------------------------------------------
+// wxMask
+// ----------------------------------------------------------------------------
 
 wxMask::wxMask()
-    : m_maskBitmap(NULL)
 {
+    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)
-    : m_maskBitmap(NULL)
+wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
 {
-    Create(bitmap, colour);
+    Init() ;
+    Create( bitmap, colour );
 }
 
-// Construct a mask from a bitmap and a palette index indicating
-// the transparent area
-wxMask::wxMask(const wxBitmap& bitmap, int paletteIndex)
-    : m_maskBitmap(NULL)
+// Construct a mask from a mono bitmap (copies the bitmap).
+wxMask::wxMask( const wxBitmap& bitmap )
 {
-    Create(bitmap, paletteIndex);
+    Init() ;
+    Create( bitmap );
 }
 
 // Construct a mask from a mono bitmap (copies the bitmap).
-wxMask::wxMask(const wxBitmap& bitmap)
-    : m_maskBitmap(NULL)
+
+wxMask::wxMask( const wxMemoryBuffer& data, int width , int height , int bytesPerRow )
 {
-    Create(bitmap);
+    Init() ;
+    Create( data, width , height , bytesPerRow );
 }
 
 wxMask::~wxMask()
 {
     if ( m_maskBitmap )
     {
-        wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;
+        CGContextRelease( (CGContextRef) m_maskBitmap );
         m_maskBitmap = NULL ;
     }
 }
 
-// Create a mask from a mono bitmap (copies the bitmap).
-bool wxMask::Create(const wxBitmap& bitmap)
+void wxMask::Init()
 {
-   if ( m_maskBitmap )
-   {
-       wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;
-       m_maskBitmap = NULL ;
-   }
-   wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
-                wxT("Cannot create mask from this bitmap type (TODO)"));
-   // other types would require a temporary bitmap. not yet implemented
+    m_width = m_height = m_bytesPerRow = 0 ;
+    m_maskBitmap = NULL ;
+}
 
-   wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap"));
+void *wxMask::GetRawAccess() const
+{
+    return m_memBuf.GetData() ;
+}
 
-   wxCHECK_MSG(bitmap.GetDepth() == 1, false,
-               wxT("Cannot create mask from colour bitmap"));
+// 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
 
-   m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
-   Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() };
+void wxMask::RealizeNative()
+{
+    if ( m_maskBitmap )
+    {
+        CGContextRelease( (CGContextRef) m_maskBitmap );
+       m_maskBitmap = NULL ;
+    }
 
-   LockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
-   LockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP()) );
-   CopyBits(GetPortBitMapForCopyBits( (GWorldPtr) bitmap.GetHBITMAP()),
-            GetPortBitMapForCopyBits( (GWorldPtr) m_maskBitmap),
-            &rect, &rect, srcCopy, 0);
-   UnlockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
-   UnlockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP()) );
+    CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceGray();
+    // from MouseTracking sample :
+    // Ironically, due to a bug in CGImageCreateWithMask, you cannot use
+    // CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) at this point!
 
-   return FALSE;
+    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 bitmap and a palette index indicating
-// the transparent area
-bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
+// Create a mask from a mono bitmap (copies the bitmap).
+
+bool wxMask::Create(const wxMemoryBuffer& data,int width , int height , int bytesPerRow)
 {
-    // TODO
-    wxCHECK_MSG( 0, false, wxT("wxMask::Create not yet implemented"));
-    return FALSE;
+    m_memBuf = data ;
+    m_width = width ;
+    m_height = height ;
+    m_bytesPerRow = bytesPerRow ;
+
+    wxASSERT( data.GetDataLen() == (size_t)(height * bytesPerRow) ) ;
+
+    RealizeNative() ;
+
+    return true ;
 }
 
-// Create a mask from a bitmap and a colour indicating
-// the transparent area
-bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
+// Create a mask from a mono bitmap (copies the bitmap).
+bool wxMask::Create(const wxBitmap& bitmap)
 {
-    if ( m_maskBitmap )
-    {
-        wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;
-        m_maskBitmap = NULL ;
-    }
-    wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
-                 wxT("Cannot create mask from this bitmap type (TODO)"));
-    // other types would require a temporary bitmap. not yet implemented 
-    
-    wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap"));
-
-    m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 ); 
-    LockPixels( GetGWorldPixMap(  (GWorldPtr) m_maskBitmap ) );
-    LockPixels( GetGWorldPixMap(  (GWorldPtr) bitmap.GetHBITMAP() ) );
-    RGBColor maskColor = MAC_WXCOLORREF(colour.GetPixel());
-
-    // this is not very efficient, but I can't think
-    // of a better way of doing it
-    CGrafPtr    origPort ;
-    GDHandle    origDevice ;
-    RGBColor  col;
-    RGBColor  colors[2] = {
-        { 0xFFFF, 0xFFFF, 0xFFFF },
-        { 0,      0,      0 }};
-            
-    GetGWorld( &origPort , &origDevice ) ;
-    for (int w = 0; w < bitmap.GetWidth(); w++)
+    m_width = bitmap.GetWidth() ;
+    m_height = bitmap.GetHeight() ;
+    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 ) ;
+    unsigned char * srcdata = (unsigned char*) bitmap.GetRawAccess() ;
+
+    for ( int y = 0 ; y < m_height ; ++y , destdatabase += m_bytesPerRow )
     {
-        for (int h = 0; h < bitmap.GetHeight(); h++)
-        {       
-            SetGWorld(  (GWorldPtr) bitmap.GetHBITMAP(), NULL ) ;
-            GetCPixel( w , h , &col ) ;
-            SetGWorld(  (GWorldPtr) m_maskBitmap , NULL ) ;
-            if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
-            {
-                SetCPixel( w , h , &colors[0] ) ;
-            }
+        unsigned char *destdata = destdatabase ;
+        unsigned char r, g, b;
+
+        for ( int x = 0 ; x < m_width ; ++x )
+        {
+            srcdata++ ;
+            r = *srcdata++ ;
+            g = *srcdata++ ;
+            b = *srcdata++ ;
+
+            if ( ( r + g + b ) > 0x10 )
+                *destdata++ = 0xFF ;
             else
-            {
-                SetCPixel( w , h , &colors[1] ) ;
-            }
+                *destdata++ = 0x00 ;
         }
     }
-    UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ;
-    UnlockPixels( GetGWorldPixMap(  (GWorldPtr) bitmap.GetHBITMAP() ) ) ;
-    SetGWorld( origPort , origDevice ) ;
 
-    return TRUE;
+    m_memBuf.UngetWriteBuf( size ) ;
+    RealizeNative() ;
+
+    return true;
 }
 
-bool wxMask::PointMasked(int x, int y)
+// Create a mask from a bitmap and a colour indicating
+// the transparent area
+bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
-   GWorldPtr origPort;
-   GDHandle  origDevice;
-   RGBColor  color;
-   bool masked = true;
+    m_width = bitmap.GetWidth() ;
+    m_height = bitmap.GetHeight() ;
+    m_bytesPerRow = GetBestBytesPerRow( m_width * kMaskBytesPerPixel ) ;
 
-   GetGWorld( &origPort, &origDevice);
+    size_t size = m_bytesPerRow * m_height ;
+    unsigned char * destdatabase = (unsigned char*) m_memBuf.GetWriteBuf( size ) ;
+    wxASSERT( destdatabase != NULL ) ;
 
-   //Set port to mask and see if it masked (1) or not ( 0 )
-   SetGWorld( (GWorldPtr) m_maskBitmap, NULL);
-   LockPixels(GetGWorldPixMap( (GWorldPtr) m_maskBitmap));
-   GetCPixel(x,y, &color);
-   masked = !(color.red == 0 && color.green == 0 && color.blue == 0);
-   UnlockPixels(GetGWorldPixMap( (GWorldPtr) m_maskBitmap));
+    memset( destdatabase , 0 , size ) ;
+    unsigned char * srcdatabase = (unsigned char*) bitmap.GetRawAccess() ;
+    size_t sourceBytesRow = bitmap.GetBitmapData()->GetBytesPerRow();
 
-   SetGWorld( origPort, origDevice);
+    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;
 
-   return masked;
-}
+        for ( int x = 0 ; x < m_width ; ++x )
+        {
+            srcdata++ ;
+            r = *srcdata++ ;
+            g = *srcdata++ ;
+            b = *srcdata++ ;
 
-/*
- * wxBitmapHandler
- */
+            if ( colour == wxColour( r , g , b ) )
+                *destdata++ = 0xFF ;
+            else
+                *destdata++ = 0x00 ;
+        }
+    }
 
-wxBitmapHandler::~wxBitmapHandler()
-{
-}
+    m_memBuf.UngetWriteBuf( size ) ;
+    RealizeNative() ;
 
-bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
-{
-    return FALSE;
+    return true;
 }
 
-bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-        int desiredWidth, int desiredHeight)
+WXHBITMAP wxMask::GetHBITMAP() const
 {
-    return FALSE;
+    return m_maskBitmap ;
 }
 
-bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
-{
-    return FALSE;
-}
+// ----------------------------------------------------------------------------
+// wxBitmapHandler
+// ----------------------------------------------------------------------------
 
-/*
- * Standard handlers
- */
+IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase)
+
+// ----------------------------------------------------------------------------
+// Standard Handlers
+// ----------------------------------------------------------------------------
+
+#ifndef __LP64__
 
 class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 {
     DECLARE_DYNAMIC_CLASS(wxPICTResourceHandler)
+
 public:
     inline wxPICTResourceHandler()
     {
-        m_name = "Macintosh Pict resource";
-        m_extension = "";
-        m_type = wxBITMAP_TYPE_PICT_RESOURCE;
+        SetName(wxT("Macintosh Pict resource"));
+        SetExtension(wxEmptyString);
+        SetType(wxBITMAP_TYPE_PICT_RESOURCE);
     };
 
     virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
           int desiredWidth, int desiredHeight);
 };
+
 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 TARGET_CARBON
-    c2pstrcpy( (StringPtr) theName , name ) ;
-#else
-    strcpy( (char *) theName , name ) ;
-    c2pstr( (char *)theName ) ;
-#endif
-    
+    wxMacStringToPascal( name , theName ) ;
+
     PicHandle thePict = (PicHandle ) GetNamedResource( 'PICT' , theName ) ;
     if ( thePict )
     {
-        PictInfo theInfo ;
-        
-        GetPictInfo( thePict , &theInfo , 0 , 0 , systemMethod , 0 ) ;
-        DetachResource( (Handle) thePict ) ;
-        M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypePict ;
-        M_BITMAPHANDLERDATA->m_hPict = thePict ;
-        M_BITMAPHANDLERDATA->m_width =  theInfo.sourceRect.right - theInfo.sourceRect.left ;
-        M_BITMAPHANDLERDATA->m_height = theInfo.sourceRect.bottom - theInfo.sourceRect.top ;
-        
-        M_BITMAPHANDLERDATA->m_depth = theInfo.depth ;
-        M_BITMAPHANDLERDATA->m_ok = true ;
-        M_BITMAPHANDLERDATA->m_numColors = theInfo.uniqueColors ;
-//      M_BITMAPHANDLERDATA->m_bitmapPalette;
-//      M_BITMAPHANDLERDATA->m_quality;
-        return TRUE ;
+        wxMetafile mf ;
+
+        mf.SetPICT( thePict ) ;
+        bitmap->Create( mf.GetWidth() , mf.GetHeight() ) ;
+        wxMemoryDC dc ;
+        dc.SelectObject( *bitmap ) ;
+        mf.Play( &dc ) ;
+        dc.SelectObject( wxNullBitmap ) ;
+
+        return true ;
     }
-    return FALSE ;
+#endif
+
+    return false ;
 }
+#endif
 
 void wxBitmap::InitStandardHandlers()
 {
-    AddHandler(new wxPICTResourceHandler) ;
-    AddHandler(new wxICONResourceHandler) ;
+#ifndef __LP64__
+    AddHandler( new wxPICTResourceHandler ) ;
+#endif
+    AddHandler( new wxICONResourceHandler ) ;
+}
+
+// ----------------------------------------------------------------------------
+// raw bitmap access support
+// ----------------------------------------------------------------------------
+
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int WXUNUSED(bpp))
+{
+    if ( !Ok() )
+        // no bitmap, no data (raw or otherwise)
+        return NULL;
+
+    data.m_width = GetWidth() ;
+    data.m_height = GetHeight() ;
+    data.m_stride = GetBitmapData()->GetBytesPerRow() ;
+
+    return BeginRawAccess() ;
+}
+
+void wxBitmap::UngetRawData(wxPixelDataBase& WXUNUSED(dataBase))
+{
+    EndRawAccess() ;
+}
+
+void wxBitmap::UseAlpha()
+{
+    // remember that we are using alpha channel:
+    // we'll need to create a proper mask in UngetRawData()
+    M_BITMAPDATA->UseAlpha( true );
 }