X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65608e3bb0a1efea84af1aafbf3e05a05285766e..c6f9fb054849dd09b99aeaad9b10b4a12eca0752:/src/mac/carbon/bitmap.cpp?ds=sidebyside

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 6fdfdbc909..6cbaa9d9b7 100644
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,29 +13,21 @@
 #pragma implementation "bitmap.h"
 #endif
 
-#include "wx/wx.h"
-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/palette.h"
+#include "wx/defs.h"
+
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/log.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 
-extern "C"
-{
-#ifdef OBSOLETE_XPM_DATA_HANDLER
-  #include "xpm.h"
-#endif
-} ;
+#include "wx/rawbmp.h"
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject )
 
-#ifdef __UNIX__
+#ifdef __DARWIN__
     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>
@@ -45,213 +37,401 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 CTabHandle wxMacCreateColorTable( int numColors )
 {
-	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 ;
+    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 ;
 }
 
-void wxMacDestroyColorTable( CTabHandle colors ) 
+void wxMacDestroyColorTable( CTabHandle colors )
 {
-	DisposeHandle( (Handle) colors ) ;
+    DisposeHandle( (Handle) colors ) ;
 }
 
 void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue )
 {
-	(**newColors).ctTable[index].value = index;
-	(**newColors).ctTable[index].rgb.red = 0 ;// someRedValue;
-	(**newColors).ctTable[index].rgb.green = 0 ; // someGreenValue;
-	(**newColors).ctTable[index].rgb.blue = 0 ; // someBlueValue;
+    (**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;
 }
 
 GWorldPtr wxMacCreateGWorld( int width , int height , int depth )
 {
-	OSErr err = noErr ;
-	GWorldPtr port ;
-	Rect rect = { 0 , 0 , height , width } ;
-	
-	if ( depth < 0 )
-	{
-		depth = wxDisplayDepth() ;     
-	}
-		
-	err = NewGWorld( &port , depth , &rect , NULL , NULL , 0 ) ;
-	if ( err == noErr )
-	{
-		return port ;
-	}
-	return NULL ;
+    OSErr err = noErr ;
+    GWorldPtr port ;
+    Rect rect = { 0 , 0 , height , width } ;
+
+    if ( depth < 0 )
+    {
+        depth = wxDisplayDepth() ;
+    }
+
+    err = NewGWorld( &port , depth , &rect , NULL , NULL , 0 ) ;
+    if ( err == noErr )
+    {
+        return port ;
+    }
+    return NULL ;
 }
 
 void wxMacDestroyGWorld( GWorldPtr gw )
 {
-	if ( gw )
-		DisposeGWorld( gw ) ;
+    if ( gw )
+        DisposeGWorld( gw ) ;
 }
 
-PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
+#define kDefaultRes 0x00480000 /* Default resolution is 72 DPI; Fixed type */
+
+OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect  *bounds , CTabHandle colors )
 {
-   CGrafPtr    origPort ;
-   GDHandle    origDev ;
+    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 */
 
-   PicHandle      pict;          // this is the Picture we give back
 
-   RGBColor    gray = { 0xCCCC ,0xCCCC , 0xCCCC } ;
-   RGBColor    white = { 0xffff ,0xffff , 0xffff } ;
-   RGBColor    black = { 0x0000 ,0x0000 , 0x0000 } ;
+    error = noErr;
+    newColors = nil;
+    offBaseAddr = nil;
 
-   unsigned char *maskimage = NULL ;
-   Rect portRect ;
-   GetPortBounds( wp , &portRect ) ;
-   int width = portRect.right - portRect.left ;
-   int height = portRect.bottom - portRect.top ;
+    bytesPerRow = ((depth * (bounds->right - bounds->left) + 31) / 32) * 4;
 
-   LockPixels( GetGWorldPixMap( wp ) ) ;
-   GetGWorld( &origPort , &origDev ) ;
+   /* 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;
 
-   if ( mask )
-   {
-      maskimage = (unsigned char*) malloc( width * height ) ;
-      SetGWorld( mask , NULL ) ;
-      LockPixels( GetGWorldPixMap( mask ) ) ;
-      for ( int y = 0 ; y < height ; y++ )
-      {
-         for( int x = 0 ; x < width ; x++ )
-         {
-            RGBColor col ;
-
-            GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-            maskimage[y*width + x] = ( col.red == 0 ) ; // for monochrome masks
-         }
-      }
-      UnlockPixels( GetGWorldPixMap( mask ) ) ;
-   }
+    /* If no errors occured, return a handle to the new off-screen PixMap */
+    if (error != noErr)
+        {
+        if (newColors != nil)
+            DisposeCTable(newColors);
+        }
 
-   SetGWorld( wp , NULL ) ;
+    /* Return the error code */
+    return error;
+}
 
-   pict = OpenPicture(&portRect);   // open a picture, this disables drawing
-   if(!pict)
-      return NULL;
+CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  )
+{
+    GWorldPtr       saveWorld;
+    GDHandle        saveHandle;
 
-   if ( maskimage )
-   {
-      RGBForeColor( &black ) ;
-      RGBBackColor( &white ) ;
-      PenMode(transparent);
+    GetGWorld(&saveWorld,&saveHandle);      // save Graphics env state
+    SetGWorld(image,nil);
 
-      for ( int y = 0 ; y < height ; ++y )
-      {
-         for( int x = 0 ; x < width ; ++x )
-         {
-            if ( maskimage[y*width + x] )
-            {
-               RGBColor col ;
+    Rect frame = { 0 , 0 , iconSize , iconSize } ;
+    Rect imageBounds = frame ;
+    GetPortBounds( image , &imageBounds ) ;
+
+    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 ;
+
+    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 ;
 
-               GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-               SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
+    (**icon).iconBMap.rowBytes = iconSize / 8 ;
+    (**icon).iconBMap.bounds = frame ;
+    (**icon).iconMask.baseAddr = (char*) &(**icon).iconMaskData ;
+    (**icon).iconBMap.baseAddr = (char*) &(**icon).iconMaskData + bwSize ;
+
+    if ( mask )
+    {
+        Rect r ;
+        GetPortBounds( image , &r ) ;
+      LockPixels(GetGWorldPixMap(mask) ) ;
+      CopyBits(GetPortBitMapForCopyBits(mask) ,
+          &(**icon).iconBMap , &r , &r, srcCopy , nil ) ;
+      CopyBits(GetPortBitMapForCopyBits(mask) ,
+          &(**icon).iconMask , &r , &r, srcCopy , nil ) ;
+      UnlockPixels(GetGWorldPixMap( mask ) ) ;
+    }
+    else
+    {
+        Rect r ;
+        GetPortBounds( image , &r ) ;
+        LockPixels(GetGWorldPixMap(image));
+      CopyBits(GetPortBitMapForCopyBits(image) ,
+          &(**icon).iconBMap , &r , &r, srcCopy , nil ) ;
+      CopyBits(GetPortBitMapForCopyBits(image) ,
+          &(**icon).iconMask , &r , &r, srcCopy , nil ) ;
+        UnlockPixels(GetGWorldPixMap(image));
+    }
+
+    (**icon).iconMask.baseAddr = NULL ;
+    (**icon).iconBMap.baseAddr = NULL ;
+    (**icon).iconPMap.baseAddr = NULL ;
+    HUnlock((Handle)icon) ;
+    SetGWorld(saveWorld,saveHandle);
+
+    return icon;
+}
+
+PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
+{
+  CGrafPtr       origPort ;
+  GDHandle       origDev ;
+
+  PicHandle      pict;
+
+  RGBColor       white = { 0xffff ,0xffff , 0xffff } ;
+  RGBColor       black = { 0x0000 ,0x0000 , 0x0000 } ;
+
+  GetGWorld( &origPort , &origDev ) ;
+
+  RgnHandle clipRgn = NULL ;
+
+  if ( mask )
+  {
+    clipRgn = NewRgn() ;
+    LockPixels( GetGWorldPixMap( mask ) ) ;
+    BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( mask ) ) ;
+    UnlockPixels( GetGWorldPixMap( mask ) ) ;
+  }
+
+  SetGWorld( wp , NULL ) ;
+  Rect portRect ;
+  if ( clipRgn )
+    GetRegionBounds( clipRgn , &portRect ) ;
+  else
+      GetPortBounds( wp , &portRect ) ;
+  pict = OpenPicture(&portRect);
+  if(pict)
+  {
+    RGBForeColor( &black ) ;
+    RGBBackColor( &white ) ;
+
+    if ( clipRgn )
+        SetClip( clipRgn ) ;
+
+    LockPixels( GetGWorldPixMap( wp ) ) ;
+    CopyBits(GetPortBitMapForCopyBits(wp),
+            GetPortBitMapForCopyBits(wp),
+            &portRect,
+            &portRect,
+            srcCopy,clipRgn);
+    UnlockPixels( GetGWorldPixMap( wp ) ) ;
+    ClosePicture();
+  }
+  SetGWorld( origPort , origDev ) ;
+  if ( clipRgn )
+      DisposeRgn( clipRgn ) ;
+  return pict;
+}
+
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
+{
+    memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
+    if ( bitmap.Ok() )
+    {
+        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 )
+        {
+            if ( (forceType == kControlContentCIconHandle || ( bmap->m_width == bmap->m_height && forceType != kControlContentPictHandle ) ) && ((bmap->m_width & 0x3) == 0) )
+            {
+                info->contentType = kControlContentCIconHandle ;
+                if ( bitmap.GetMask() )
+                {
+                    info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap()) ,
+                                                           8 , bmap->m_width ) ;
+                }
+                else
+                {
+                    info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
+                                                           8 , bmap->m_width ) ;
+                }
             }
-            else {
-                // With transparency set this sets a blank pixel not a white one
-                SetCPixel( x + portRect.left , y + portRect.top , &white);
+            else
+            {
+                info->contentType = kControlContentPictHandle ;
+                if ( bitmap.GetMask() )
+                {
+                    info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap() ) ) ;
+               }
+                else
+                {
+                    info->u.picture = wxMacCreatePict( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ) ;
+                }
             }
-         }
-      }
-      free( maskimage ) ;
-      maskimage = NULL ;
-   }
-   else
-   {
-      RGBBackColor( &gray ) ;
-      EraseRect(&portRect);
-      RGBForeColor( &black ) ;
-      RGBBackColor( &white ) ;
-
-      CopyBits(GetPortBitMapForCopyBits(wp), /* src PixMap - we copy image over
-                                              * itself - */
-               GetPortBitMapForCopyBits(wp), //  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( wp ) ) ;
-   SetGWorld( origPort , origDev ) ;
-
-   return pict;                  // return our groovy pict handle
+        }
+        else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+        {
+            info->contentType = kControlContentCIconHandle ;
+            info->u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
+        }
+    }
 }
 
 wxBitmapRefData::wxBitmapRefData()
+    : m_width(0)
+    , m_height(0)
+    , m_depth(0)
+    , m_ok(FALSE)
+    , m_numColors(0)
+    , m_quality(0)
 {
-    m_ok = FALSE;
-    m_width = 0;
-    m_height = 0;
-    m_depth = 0;
-    m_quality = 0;
-    m_numColors = 0;
     m_bitmapMask = NULL;
     m_hBitmap = NULL ;
     m_hPict = NULL ;
+    m_hIcon = NULL ;
     m_bitmapType = kMacBitmapTypeUnknownType ;
+    m_hasAlpha = false;
+}
+
+// TODO move this to a public function of Bitmap Ref
+static void DisposeBitmapRefData(wxBitmapRefData *data)
+{
+    if ( !data )
+        return ;
+
+    switch (data->m_bitmapType)
+    {
+        case kMacBitmapTypePict :
+            {
+                if ( data->m_hPict )
+                {
+                    KillPicture( MAC_WXHMETAFILE( data->m_hPict ) ) ;
+                    data->m_hPict = NULL ;
+                }
+            }
+            break ;
+        case kMacBitmapTypeGrafWorld :
+            {
+                if ( data->m_hBitmap )
+                {
+                    wxMacDestroyGWorld( MAC_WXHBITMAP(data->m_hBitmap) ) ;
+                    data->m_hBitmap = NULL ;
+                }
+            }
+            break ;
+        case kMacBitmapTypeIcon :
+            if ( data->m_hIcon )
+            {
+                DisposeCIcon( MAC_WXHICON(data->m_hIcon) ) ;
+                data->m_hIcon = NULL ;
+            }
+
+        default :
+            // unkown type ?
+            break ;
+    }
+
+    if (data->m_bitmapMask)
+    {
+        delete data->m_bitmapMask;
+        data->m_bitmapMask = NULL;
+    }
 }
 
 wxBitmapRefData::~wxBitmapRefData()
 {
-	switch (m_bitmapType)
-	{
-		case kMacBitmapTypePict :
-			{
-				if ( m_hPict )
-				{
-					KillPicture( m_hPict ) ;
-					m_hPict = NULL ;
-				}
-			}
-			break ;
-		case kMacBitmapTypeGrafWorld :
-			{
-				if ( m_hBitmap )
-				{
-					wxMacDestroyGWorld( m_hBitmap ) ;
-					m_hBitmap = NULL ;
-				}
-			}
-			break ;
-		default :
-			// unkown type ?
-			break ;
-	}
-	
-  if (m_bitmapMask)
-  {
-    delete m_bitmapMask;
-    m_bitmapMask = NULL;
-  }
+  DisposeBitmapRefData( this ) ;
 }
 
-wxList wxBitmap::sm_handlers;
+bool wxBitmap::CopyFromIcon(const wxIcon& icon)
+{
+    Ref(icon) ;
+    return true;
+}
 
 wxBitmap::wxBitmap()
 {
     m_refData = NULL;
-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);
 }
 
 wxBitmap::~wxBitmap()
 {
-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);
 }
 
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
@@ -266,28 +446,28 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     {
         M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
         M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
-        M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
-	
-        CGrafPtr 	origPort ;
-        GDHandle	origDevice ;
-	
+        M_BITMAPDATA->m_ok = (MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) != NULL ) ;
+
+        CGrafPtr    origPort ;
+        GDHandle    origDevice ;
+
         GetGWorld( &origPort , &origDevice ) ;
-        SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ;
-        LockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
-	
+        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] = { 
+
+        RGBColor colors[2] = {
             { 0xFFFF , 0xFFFF , 0xFFFF } ,
-            { 0, 0 , 0 } 
+            { 0, 0 , 0 }
         } ;
-	
+
         for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
         {
             for ( int x = 0 ; x < the_width ; ++x )
@@ -305,42 +485,29 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
                 }
             }
         }
-        UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
-	
+        UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) ) ) ;
+
         SetGWorld( origPort , origDevice ) ;
     }
     else
     {
         wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
     }
-    
-    if ( wxTheBitmapList ) {
-        wxTheBitmapList->AddBitmap(this);
-    }
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 {
     (void)Create(w, h, d);
-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);
 }
 
-wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
+wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, depth);
-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);
 }
 
-wxBitmap::wxBitmap(const wxString& filename, long type)
+wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
-    LoadFile(filename, (int)type);
-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);
+    LoadFile(filename, type);
 }
 
 bool wxBitmap::CreateFromXpm(const char **bits)
@@ -348,28 +515,19 @@ bool wxBitmap::CreateFromXpm(const char **bits)
     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);   
-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
+    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
+    *this = wxBitmap(img);
     return TRUE;
 }
 
 wxBitmap::wxBitmap(const char **bits)
 {
-#ifdef OBSOLETE_XPM_DATA_HANDLER
-    (void) Create((void *)bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
-#else
     (void) CreateFromXpm(bits);
-#endif
 }
 
 wxBitmap::wxBitmap(char **bits)
 {
-#ifdef OBSOLETE_XPM_DATA_HANDLER
-    (void) Create((void *)bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
-#else
     (void) CreateFromXpm((const char **)bits);
-#endif
 }
 
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
@@ -380,11 +538,11 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
                 (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") );
 
-   WXHBITMAP origPort;
+   GWorldPtr origPort;
    GDHandle  origDevice;
 
    GetGWorld( &origPort, &origDevice );
@@ -393,7 +551,9 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
    wxBitmapRefData *ref = (wxBitmapRefData *)ret.GetRefData();
 
    ref->m_numColors     = M_BITMAPDATA->m_numColors;
-   ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette;
+#if wxUSE_PALETTE
+    ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette;
+#endif // wxUSE_PALETTE
    ref->m_bitmapType    = M_BITMAPDATA->m_bitmapType;
 
    // Copy sub region of this bitmap
@@ -406,11 +566,11 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
        // Copy mask
        if(GetMask())
        {
-           WXHBITMAP submask, mask;
+           GWorldPtr submask, mask;
            RGBColor  color;
 
-           mask = GetMask()->GetMaskBitmap();
-           submask = wxMacCreateGWorld(rect.width, rect.height, 1);
+           mask = (GWorldPtr) GetMask()->GetMaskBitmap();
+           submask = wxMacCreateGWorld(rect.width, rect.height, GetMask()->GetDepth() );
            LockPixels(GetGWorldPixMap(mask));
            LockPixels(GetGWorldPixMap(submask));
 
@@ -433,11 +593,11 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
        // Copy bitmap
        if(GetHBITMAP())
        {
-           WXHBITMAP subbitmap, bitmap;
+           GWorldPtr subbitmap, bitmap;
            RGBColor  color;
 
-           bitmap = GetHBITMAP();
-           subbitmap = wxMacCreateGWorld(rect.width, rect.height, GetDepth());
+           bitmap = (GWorldPtr) GetHBITMAP();
+           subbitmap = (GWorldPtr) ref->m_hBitmap ;
            LockPixels(GetGWorldPixMap(bitmap));
            LockPixels(GetGWorldPixMap(subbitmap));
 
@@ -453,7 +613,6 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
            }
            UnlockPixels(GetGWorldPixMap(bitmap));
            UnlockPixels(GetGWorldPixMap(subbitmap));
-           ret.SetHBITMAP(subbitmap);
        }
    }
    SetGWorld( origPort, origDevice );
@@ -473,7 +632,7 @@ bool wxBitmap::Create(int w, int h, int d)
 
     M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( w , h , d ) ;
-		M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+    M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hBitmap != NULL ) ;
     return M_BITMAPDATA->m_ok;
 }
 
@@ -486,29 +645,65 @@ int wxBitmap::GetBitmapType() const
 
 void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
+    if (!M_BITMAPDATA)
+        m_refData = new wxBitmapRefData;
+    else
+        DisposeBitmapRefData( M_BITMAPDATA ) ;
+
     M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     M_BITMAPDATA->m_hBitmap = bmp ;
-		M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+    M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hBitmap != NULL ) ;
 }
 
-bool wxBitmap::LoadFile(const wxString& filename, long type)
+void wxBitmap::SetHICON(WXHICON ico)
 {
-    UnRef();
+    if (!M_BITMAPDATA)
+        m_refData = new wxBitmapRefData;
+    else
+        DisposeBitmapRefData( M_BITMAPDATA ) ;
 
-    m_refData = new wxBitmapRefData;
+    M_BITMAPDATA->m_bitmapType = kMacBitmapTypeIcon ;
+    M_BITMAPDATA->m_hIcon = ico ;
+    M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hIcon != NULL ) ;
+}
+
+void wxBitmap::SetPict(WXHMETAFILE pict)
+{
+    if (!M_BITMAPDATA)
+        m_refData = new wxBitmapRefData;
+    else
+        DisposeBitmapRefData( M_BITMAPDATA ) ;
+
+    M_BITMAPDATA->m_bitmapType = kMacBitmapTypePict ;
+    M_BITMAPDATA->m_hPict = pict ;
+    M_BITMAPDATA->m_ok = ( M_BITMAPDATA->m_hPict != NULL ) ;
+}
+
+bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
+{
+    UnRef();
 
     wxBitmapHandler *handler = FindHandler(type);
 
-    if ( handler == NULL ) {
-        wxLogWarning("no bitmap handler for type %d defined.", type);
+    if ( handler )
+    {
+        m_refData = new wxBitmapRefData;
 
-        return FALSE;
+        return handler->LoadFile(this, filename, type, -1, -1);
     }
-
-    return handler->LoadFile(this, filename, type, -1, -1);
+    else
+    {
+        wxImage loadimage(filename, type);
+        if (loadimage.Ok()) {
+            *this = loadimage;
+            return true;
+        }
+    }
+    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+    return false;
 }
 
-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int depth)
 {
     UnRef();
 
@@ -517,7 +712,7 @@ bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
     wxBitmapHandler *handler = FindHandler(type);
 
     if ( handler == NULL ) {
-        wxLogWarning("no bitmap handler for type %d defined.", type);
+        wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
 
         return FALSE;
     }
@@ -531,8 +726,6 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
     wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") )
 
     m_refData = new wxBitmapRefData();
-      
-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
 
     // width and height of the device-dependent bitmap
     int width = image.GetWidth();
@@ -540,62 +733,99 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     // Create picture
 
-    Create( width , height , wxDisplayDepth() ) ;
-    wxBitmap maskBitmap( width, height, 1);
-    
+    Create( width , height , 32 ) ;
+
     CGrafPtr origPort ;
     GDHandle origDevice ;
 
-    LockPixels( GetGWorldPixMap(GetHBITMAP()) );
-    LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
+    PixMapHandle pixMap = GetGWorldPixMap((GWorldPtr)GetHBITMAP()) ;
+    LockPixels( pixMap );
 
     GetGWorld( &origPort , &origDevice ) ;
-    SetGWorld( GetHBITMAP() , NULL ) ;
-    
-    // Render image
-    wxColour rgb, maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
-    RGBColor color;
-    RGBColor white = { 0xffff, 0xffff, 0xffff };
-    RGBColor black = { 0     , 0     , 0      };
+    SetGWorld( (GWorldPtr) GetHBITMAP() , NULL ) ;
 
+    // Render image
     register unsigned char* data = image.GetData();
-
-    int index = 0;
+    char* destinationBase = GetPixBaseAddr( pixMap );
+    register unsigned char* destination = (unsigned char*) destinationBase ;
     for (int y = 0; y < height; y++)
     {
         for (int x = 0; x < width; x++)
         {
-            rgb.Set(data[index++], data[index++], data[index++]);
-            color = rgb.GetPixel();
-            SetCPixel( x , y , &color ) ;
-            if (image.HasMask())
-            {
-                SetGWorld(maskBitmap.GetHBITMAP(), NULL);
-                if (rgb == maskcolor) {
-                    SetCPixel(x,y, &white);
-                }
-                else {
-                    SetCPixel(x,y, &black);
-                }
-                SetGWorld(GetHBITMAP(), NULL);
-            }
+            *destination++ = 0 ;
+            *destination++ = *data++ ;
+            *destination++ = *data++ ;
+            *destination++ = *data++ ;
         }
-    }  // for height
+        destinationBase += ((**pixMap).rowBytes & 0x7fff);
+        destination = (unsigned char*) destinationBase ;
+    }
+    if ( image.HasAlpha() )
+    {
+      unsigned char *alpha = image.GetAlpha();
+
+      wxColour maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
+      RGBColor color ;
+      wxBitmap maskBitmap ;
+
+      maskBitmap.Create( width, height, 24);
+      LockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
+      SetGWorld( (GWorldPtr) maskBitmap.GetHBITMAP(), NULL);
+
+      for (int y = 0; y < height; y++)
+      {
+          for (int x = 0; x < width; x++)
+          {
+              memset( &color , 255 - *alpha , sizeof( color ) );
+              SetCPixel(x,y, &color);
+
+              alpha += 1 ;
+          }
+      }  // for height
+      SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);
+      SetMask(new wxMask( maskBitmap ));
+      UnlockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
+    }
+    else if ( image.HasMask() )
+    {
+      data = image.GetData();
 
-    // Create mask
-    if ( image.HasMask() ) {
-//        SetMask(new wxMask( maskBitmap ));
+      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(GetHBITMAP()) );
-    UnlockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
+
+    UnlockPixels( GetGWorldPixMap( (GWorldPtr) GetHBITMAP()) );
     SetGWorld( origPort, origDevice );
 }
 
 wxImage wxBitmap::ConvertToImage() const
 {
     wxImage image;
-    
+
     wxCHECK_MSG( Ok(), wxNullImage, wxT("invalid bitmap") );
 
     // create an wxImage object
@@ -607,8 +837,10 @@ wxImage wxBitmap::ConvertToImage() const
 
     wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
 
-    WXHBITMAP origPort;
+    GWorldPtr origPort;
     GDHandle  origDevice;
+    RgnHandle maskRgn = NULL ;
+    GWorldPtr tempPort = NULL ;
     int      index;
     RGBColor color;
     // background color set to RGB(16,16,16) in consistent with wxGTK
@@ -617,9 +849,28 @@ wxImage wxBitmap::ConvertToImage() const
     wxMask  *mask = GetMask();
 
     GetGWorld( &origPort, &origDevice );
-    LockPixels(GetGWorldPixMap(GetHBITMAP()));
-    SetGWorld( GetHBITMAP(), NULL);
-
+    if ( GetBitmapType() != kMacBitmapTypeGrafWorld )
+    {
+        tempPort = wxMacCreateGWorld( width , height , -1) ;
+    }
+    else
+    {
+        tempPort =  (GWorldPtr) GetHBITMAP() ;
+    }
+    LockPixels(GetGWorldPixMap(tempPort));
+    SetGWorld( tempPort, NULL);
+    if ( GetBitmapType() == kMacBitmapTypePict || GetBitmapType() == kMacBitmapTypeIcon )
+    {
+        Rect bitmaprect = { 0 , 0 , height, width };
+        if ( GetBitmapType() == kMacBitmapTypeIcon )
+        {
+            ::PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(GetHICON()) ) ;
+            maskRgn = NewRgn() ;
+            BitMapToRegion( maskRgn , &(**(MAC_WXHICON(GetHICON()))).iconMask ) ;
+        }
+         else
+             ::DrawPicture( (PicHandle) GetPict(), &bitmaprect ) ;
+    }
     // Copy data into image
     index = 0;
     for (int yy = 0; yy < height; yy++)
@@ -633,43 +884,73 @@ wxImage wxBitmap::ConvertToImage() const
             data[index    ] = r;
             data[index + 1] = g;
             data[index + 2] = b;
-            if (mask)
+            if ( maskRgn )
             {
-                if (mask->PointMasked(xx,yy))
+                Point pt ;
+                pt.h = xx ;
+                pt.v = yy ;
+                if ( !PtInRgn( pt , maskRgn ) )
                 {
                     data[index    ] = mask_r;
                     data[index + 1] = mask_g;
                     data[index + 2] = mask_b;
                 }
             }
+            else
+            {
+                if (mask)
+                {
+                    if (mask->PointMasked(xx,yy))
+                    {
+                        data[index    ] = mask_r;
+                        data[index + 1] = mask_g;
+                        data[index + 2] = mask_b;
+                    }
+                }
+            }
             index += 3;
         }
     }
-    if (mask)
+    if (mask || maskRgn )
     {
         image.SetMaskColour( mask_r, mask_g, mask_b );
         image.SetMask( true );
     }
 
     // Free resources
-    UnlockPixels(GetGWorldPixMap(GetHBITMAP()));
+    UnlockPixels(GetGWorldPixMap( tempPort ));
     SetGWorld(origPort, origDevice);
+    if ( GetBitmapType() != kMacBitmapTypeGrafWorld )
+    {
+        wxMacDestroyGWorld( tempPort ) ;
+    }
+    if ( maskRgn )
+    {
+        DisposeRgn( maskRgn ) ;
+    }
 
     return image;
 }
 
 
-bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *palette)
+bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type,
+                        const wxPalette *palette) const
 {
     wxBitmapHandler *handler = FindHandler(type);
 
-    if ( handler == NULL ) {
-        wxLogWarning("no bitmap handler for type %d defined.", type);
+    if ( handler )
+    {
+        return handler->SaveFile(this, filename, type, palette);
+    }
+    else
+    {
+        wxImage image = ConvertToImage();
 
-        return FALSE;
-  }
+        return image.SaveFile(filename, type);
+    }
 
-  return handler->SaveFile(this, filename, type, palette);
+    wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
+    return false;
 }
 
 bool wxBitmap::Ok() const
@@ -752,6 +1033,7 @@ void wxBitmap::SetOk(bool isOk)
     M_BITMAPDATA->m_ok = isOk;
 }
 
+#if wxUSE_PALETTE
 wxPalette *wxBitmap::GetPalette() const
 {
    wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap  GetPalette()") );
@@ -766,12 +1048,16 @@ void wxBitmap::SetPalette(const wxPalette& palette)
 
     M_BITMAPDATA->m_bitmapPalette = palette ;
 }
+#endif // wxUSE_PALETTE
 
 void wxBitmap::SetMask(wxMask *mask)
 {
     if (!M_BITMAPDATA)
         m_refData = new wxBitmapRefData;
 
+    // Remove existing mask if there is one.
+    delete M_BITMAPDATA->m_bitmapMask;
+
     M_BITMAPDATA->m_bitmapMask = mask ;
 }
 
@@ -779,161 +1065,38 @@ WXHBITMAP wxBitmap::GetHBITMAP() const
 {
    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 
-   return M_BITMAPDATA->m_hBitmap;
+   return MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap);
 }
 
-PicHandle wxBitmap::GetPict() const
+WXHMETAFILE wxBitmap::GetPict( bool *created ) const
 {
-   wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
-   
-   PicHandle picture;       // This is the returned picture
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 
-   // If bitmap already in Pict format return pointer
-   if(M_BITMAPDATA->m_bitmapType == kMacBitmapTypePict) {
+    PicHandle picture = NULL ;       // This is the returned picture
+    if ( created )
+        (*created) = false ;
+    // 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) {
+    }
+    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( GetHBITMAP() , &portRect ) ;
-   int width = portRect.right - portRect.left ;
-   int height = portRect.bottom - portRect.top ;
-
-   LockPixels( GetGWorldPixMap( GetHBITMAP() ) ) ;
-   GetGWorld( &origPort , &origDev ) ;
-
-   mask = GetMask();
-
-   SetGWorld( GetHBITMAP() , NULL ) ;
-
-   picture = OpenPicture(&portRect);   // open a picture, this disables drawing
-   if(!picture) {
-       return NULL;
-   }
-
-   if( mask )
-   {
-#ifdef __UNIX__
-       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(GetHBITMAP()), 
-                // src PixMap - we copy image over itself -
-                GetPortBitMapForCopyBits(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( GetHBITMAP() ) ) ;
-   SetGWorld( origPort , origDev ) ;
-
-   return picture;                  // return our groovy pict handle
-}
-
-void wxBitmap::AddHandler(wxBitmapHandler *handler)
-{
-    sm_handlers.Append(handler);
-}
-
-void wxBitmap::InsertHandler(wxBitmapHandler *handler)
-{
-    sm_handlers.Insert(handler);
-}
-
-bool wxBitmap::RemoveHandler(const wxString& name)
-{
-    wxBitmapHandler *handler = FindHandler(name);
-    if ( handler )
-    {
-        sm_handlers.DeleteObject(handler);
-        return TRUE;
     }
     else
-        return FALSE;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& name)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if ( handler->GetName() == name )
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(const wxString& extension, long bitmapType)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
     {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if ( handler->GetExtension() == extension &&
-                    (bitmapType == -1 || handler->GetType() == bitmapType) )
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if (handler->GetType() == bitmapType)
-            return handler;
-        node = node->Next();
+        if ( GetMask() )
+        {
+            picture = wxMacCreatePict( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) , MAC_WXHBITMAP(GetMask()->GetMaskBitmap() ) ) ;
+        }
+        else
+        {
+            picture = wxMacCreatePict( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) , NULL ) ;
+        }
+        if ( created && picture )
+            (*created) = true ;
     }
-    return NULL;
+     return picture ;
 }
 
 /*
@@ -941,40 +1104,40 @@ wxBitmapHandler *wxBitmap::FindHandler(long bitmapType)
  */
 
 wxMask::wxMask()
+    : m_maskBitmap(NULL)
 {
-    m_maskBitmap = 0;
 }
 
 // Construct a mask from a bitmap and a colour indicating
 // the transparent area
 wxMask::wxMask(const wxBitmap& bitmap, const wxColour& colour)
+    : m_maskBitmap(NULL)
 {
-    m_maskBitmap = 0;
     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)
 {
-    m_maskBitmap = 0;
     Create(bitmap, paletteIndex);
 }
 
 // Construct a mask from a mono bitmap (copies the bitmap).
 wxMask::wxMask(const wxBitmap& bitmap)
+    : m_maskBitmap(NULL)
 {
-    m_maskBitmap = 0;
     Create(bitmap);
 }
 
 wxMask::~wxMask()
 {
-	if ( m_maskBitmap )
-	{
-		wxMacDestroyGWorld( m_maskBitmap ) ;
-		m_maskBitmap = NULL ;
-	}
+    if ( m_maskBitmap )
+    {
+        wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;
+        m_maskBitmap = NULL ;
+    }
 }
 
 // Create a mask from a mono bitmap (copies the bitmap).
@@ -982,7 +1145,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
 {
    if ( m_maskBitmap )
    {
-       wxMacDestroyGWorld( m_maskBitmap ) ;
+       wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;
        m_maskBitmap = NULL ;
    }
    wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
@@ -991,19 +1154,17 @@ bool wxMask::Create(const wxBitmap& bitmap)
 
    wxCHECK_MSG( bitmap.Ok(), false, wxT("Invalid bitmap"));
 
-   wxCHECK_MSG(bitmap.GetDepth() == 1, false,
-               wxT("Cannot create mask from colour bitmap"));
-
-   m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
+   m_depth = bitmap.GetDepth() ;
+   m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), bitmap.GetDepth() );
    Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() };
 
-   LockPixels( GetGWorldPixMap(m_maskBitmap) );
-   LockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) );
-   CopyBits(GetPortBitMapForCopyBits(bitmap.GetHBITMAP()),
-            GetPortBitMapForCopyBits(m_maskBitmap),
+   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(m_maskBitmap) );
-   UnlockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) );
+   UnlockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
+   UnlockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP()) );
 
    return FALSE;
 }
@@ -1012,8 +1173,8 @@ bool wxMask::Create(const wxBitmap& bitmap)
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
-// TODO
-    wxCHECK_MSG( 0, false, wxT("Not implemented"));
+    // TODO
+    wxCHECK_MSG( 0, false, wxT("wxMask::Create not yet implemented"));
     return FALSE;
 }
 
@@ -1021,59 +1182,60 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
-	if ( m_maskBitmap )
-	{
-		wxMacDestroyGWorld( m_maskBitmap ) ;
-		m_maskBitmap = NULL ;
-	}
-	wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
+    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 
-	
+    // 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( m_maskBitmap ) );
-	LockPixels( GetGWorldPixMap( bitmap.GetHBITMAP() ) );
-	RGBColor maskColor = colour.GetPixel();
+    m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 );
+    m_depth = 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 ;
+    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++)
+
+    GetGWorld( &origPort , &origDevice ) ;
+    for (int w = 0; w < bitmap.GetWidth(); w++)
     {
         for (int h = 0; h < bitmap.GetHeight(); h++)
-        {		
-			SetGWorld( bitmap.GetHBITMAP(), NULL ) ;
-			GetCPixel( w , h , &col ) ;
-			SetGWorld( m_maskBitmap , NULL ) ;
+        {
+            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] ) ;
+                SetCPixel( w , h , &colors[0] ) ;
             }
             else
             {
-				SetCPixel( w , h , &colors[1] ) ;
+                SetCPixel( w , h , &colors[1] ) ;
             }
         }
     }
-	UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ;
-	UnlockPixels( GetGWorldPixMap( bitmap.GetHBITMAP() ) ) ;
-	SetGWorld( origPort , origDevice ) ;
+    UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ;
+    UnlockPixels( GetGWorldPixMap(  (GWorldPtr) bitmap.GetHBITMAP() ) ) ;
+    SetGWorld( origPort , origDevice ) ;
 
     return TRUE;
 }
 
 bool wxMask::PointMasked(int x, int y)
 {
-   WXHBITMAP origPort;
+   GWorldPtr origPort;
    GDHandle  origDevice;
    RGBColor  color;
    bool masked = true;
@@ -1081,11 +1243,11 @@ bool wxMask::PointMasked(int x, int y)
    GetGWorld( &origPort, &origDevice);
 
    //Set port to mask and see if it masked (1) or not ( 0 )
-   SetGWorld(m_maskBitmap, NULL);
-   LockPixels(GetGWorldPixMap(m_maskBitmap));
+   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(m_maskBitmap));
+   UnlockPixels(GetGWorldPixMap( (GWorldPtr) m_maskBitmap));
 
    SetGWorld( origPort, origDevice);
 
@@ -1096,20 +1258,22 @@ bool wxMask::PointMasked(int x, int y)
  * wxBitmapHandler
  */
 
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
+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 type,
+bool wxBitmapHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
         int desiredWidth, int desiredHeight)
 {
     return FALSE;
 }
 
-bool wxBitmapHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
+bool wxBitmapHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
 {
     return FALSE;
 }
@@ -1124,8 +1288,8 @@ class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 public:
     inline wxPICTResourceHandler()
     {
-        m_name = "Macintosh Pict resource";
-        m_extension = "";
+        m_name = wxT("Macintosh Pict resource");
+        m_extension = wxEmptyString;
         m_type = wxBITMAP_TYPE_PICT_RESOURCE;
     };
 
@@ -1137,309 +1301,136 @@ IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
 bool  wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
           int desiredWidth, int desiredHeight)
 {
-	Str255 theName ;
-	
-#if TARGET_CARBON
-	c2pstrcpy( (StringPtr) theName , name ) ;
-#else
-	strcpy( (char *) theName , name ) ;
-	c2pstr( (char *)theName ) ;
-#endif
-	
-	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 ;
-	}
-	return FALSE ;
-}
-
-/* TODO: bitmap handlers, a bit like this:
-class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
-public:
-    inline wxBMPResourceHandler()
-    {
-        m_name = "Windows bitmap resource";
-        m_extension = "";
-        m_type = wxBITMAP_TYPE_BMP_RESOURCE;
-    };
+    Str255 theName ;
+    wxMacStringToPascal( name , theName ) ;
 
-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-*/
+    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 ;
+    }
+    return FALSE ;
+}
 
-class WXDLLEXPORT wxXPMFileHandler: public wxBitmapHandler
+void wxBitmap::InitStandardHandlers()
 {
-  DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
-public:
-  inline wxXPMFileHandler(void)
-  {
-  m_name = "XPM bitmap file";
-  m_extension = "xpm";
-  m_type = wxBITMAP_TYPE_XPM;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth = -1, int desiredHeight = -1);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
+    AddHandler(new wxPICTResourceHandler) ;
+    AddHandler(new wxICONResourceHandler) ;
+}
 
-bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-#if USE_XPM_IN_MSW
-    XImage *ximage;
-    XpmAttributes xpmAttr;
-    HDC     dc;
+// ----------------------------------------------------------------------------
+// raw bitmap access support
+// ----------------------------------------------------------------------------
 
-    M_BITMAPHANDLERDATA->m_ok = FALSE;
-    dc = CreateCompatibleDC(NULL);
-    if (dc)
+void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+{
+    if ( !Ok() )
     {
-      xpmAttr.valuemask = XpmReturnPixels;
-      int errorStatus = XpmReadFileToImage(&dc, WXSTRINGCAST name, &ximage, (XImage **) NULL, &xpmAttr);
-      DeleteDC(dc);
-      if (errorStatus == XpmSuccess)
-      {
-        M_BITMAPHANDLERDATA->m_hBitmap = (WXHBITMAP) ximage->bitmap;
-
-        BITMAP  bm;
-        GetObject((HBITMAP)M_BITMAPHANDLERDATA->m_hBitmap, sizeof(bm), (LPSTR) & bm);
-
-        M_BITMAPHANDLERDATA->m_width = (bm.bmWidth);
-        M_BITMAPHANDLERDATA->m_height = (bm.bmHeight);
-        M_BITMAPHANDLERDATA->m_depth = (bm.bmPlanes * bm.bmBitsPixel);
-        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-        XpmFreeAttributes(&xpmAttr);
-        XImageFree(ximage);
-
-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        return TRUE;
-      }
-      else
-      {
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        return FALSE;
-      }
+        // no bitmap, no data (raw or otherwise)
+        return NULL;
     }
-#endif
 
-    return FALSE;
-}
+   if ( M_BITMAPDATA->m_bitmapType != kMacBitmapTypeGrafWorld )
+   {
+       wxFAIL_MSG( _T("GetRawData() only supported for GWorlds") );
 
-bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette)
-{
-#if USE_XPM_IN_MSW
-      HDC     dc = NULL;
+       return NULL;
+   }
 
-      Visual *visual = NULL;
-      XImage  ximage;
+   GWorldPtr gworld = MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap);
+   PixMapHandle hPixMap = GetGWorldPixMap(gworld);
+   wxCHECK_MSG( hPixMap && *hPixMap, NULL,
+                    _T("GetRawData(): failed to get PixMap from GWorld?") );
 
-      dc = CreateCompatibleDC(NULL);
-      if (dc)
-      {
-        if (SelectObject(dc, (HBITMAP) M_BITMAPHANDLERDATA->m_hBitmap))
-        { 
-          
-    ximage.width = M_BITMAPHANDLERDATA->m_width; 
-     ximage.height = M_BITMAPHANDLERDATA->m_height;
-    ximage.depth = M_BITMAPHANDLERDATA->m_depth; 
-     ximage.bitmap = (void *)M_BITMAPHANDLERDATA->m_hBitmap;
-    int errorStatus = XpmWriteFileFromImage(&dc, WXSTRINGCAST name,
-              &ximage, (XImage *) NULL, (XpmAttributes *) NULL);
-
-          if (dc)
-      DeleteDC(dc);
-
-    if (errorStatus == XpmSuccess)
-      return TRUE;    
-    else
-      return FALSE;
-        } else return FALSE;
-      } else return FALSE;
-#else
-  return FALSE;
-#endif
-}
+   wxCHECK_MSG( (*hPixMap)->pixelSize == bpp, NULL,
+                    _T("GetRawData(): pixel format mismatch") );
 
-#ifdef OBSOLETE_XPM_DATA_HANDLER
-class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
-public:
-  inline wxXPMDataHandler(void)
-  {
-  m_name = "XPM bitmap data";
-  m_extension = "xpm";
-  m_type = wxBITMAP_TYPE_XPM_DATA;
-  };
+   if ( !LockPixels(hPixMap) )
+   {
+       wxFAIL_MSG( _T("failed to lock PixMap in GetRawData()") );
 
-  virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
+       return NULL;
+   }
 
-bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
-{
-    XImage *		ximage = NULL ;
-    XImage *		xshapeimage = NULL ;
-    int     		ErrorStatus;
-    XpmAttributes 	xpmAttr;
+   data.m_width = GetWidth();
+   data.m_height = GetHeight();
+   data.m_stride = (*hPixMap)->rowBytes & 0x7fff;
 
-    xpmAttr.valuemask = XpmReturnInfos; // get infos back
-    ErrorStatus = XpmCreateImageFromData( GetMainDevice() , (char **)data,
-         &ximage, &xshapeimage, &xpmAttr);
+   M_BITMAPDATA->m_hasAlpha = false;
 
-    if (ErrorStatus == XpmSuccess)
-    {
-        M_BITMAPHANDLERDATA->m_ok = FALSE;
-        M_BITMAPHANDLERDATA->m_numColors = 0;
-        M_BITMAPHANDLERDATA->m_hBitmap = ximage->gworldptr ;
-	  
-        M_BITMAPHANDLERDATA->m_width = ximage->width;
-        M_BITMAPHANDLERDATA->m_height = ximage->height;
-        M_BITMAPHANDLERDATA->m_depth = ximage->depth;
-        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
-    	XpmFreeAttributes(&xpmAttr);
-        M_BITMAPHANDLERDATA->m_ok = TRUE;
-        ximage->gworldptr = NULL ;
-        XImageFree(ximage); // releases the malloc, but does not detroy
-		                  // the bitmap
-        M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
-        if ( xshapeimage != NULL )
-        {
-        	wxMask* m = new wxMask() ;
-        	m->SetMaskBitmap( xshapeimage->gworldptr ) ;
-        	M_BITMAPHANDLERDATA->m_bitmapMask = m ;
-        }
-        return TRUE;
-    } 
-    else
-    {
-      M_BITMAPHANDLERDATA->m_ok = FALSE;
-      return FALSE;
-    }
-  return FALSE;
+   return GetPixBaseAddr(hPixMap);
 }
-#endif
 
-class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
+void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
 {
-    DECLARE_DYNAMIC_CLASS(wxBMPResourceHandler)
-public:
-    inline wxBMPResourceHandler()
-    {
-        m_name = "Windows bitmap resource";
-        m_extension = "";
-        m_type = wxBITMAP_TYPE_BMP_RESOURCE;
-    };
+    if ( !Ok() )
+        return;
 
-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight);
-};
+    if ( M_BITMAPDATA->m_hasAlpha )
+    {
+        wxAlphaPixelData& data = (wxAlphaPixelData&)dataBase;
 
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+        int w = data.GetWidth(),
+            h = data.GetHeight();
 
-bool wxBMPResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-    // TODO: load colourmap.
-  // it's probably not found
-  wxLogError("Can't load bitmap '%s' from resources! Check .rc file.", name.c_str());
+        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;
 
-  return FALSE;
-}
+            for ( int x = 0; x < w; x++ )
+            {
+                const wxAlphaPixelData::Iterator::ChannelType
+                    alpha = p.Alpha();
 
-class WXDLLEXPORT wxBMPFileHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
-public:
-  inline wxBMPFileHandler(void)
-  {
-  m_name = "Windows bitmap file";
-  m_extension = "bmp";
-  m_type = wxBITMAP_TYPE_BMP;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
+                pMask.Red() = alpha;
+                pMask.Green() = alpha;
+                pMask.Blue() = alpha;
 
-IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+                ++p;
+                ++pMask;
+            }
 
-bool wxBMPFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-#if USE_IMAGE_LOADING_IN_MSW
-    wxPalette *palette = NULL;
-    bool success = FALSE;
-    success = (wxLoadIntoBitmap(WXSTRINGCAST name, bitmap, &palette) != 0);
-    if (!success && palette)
-    {
-      delete palette;
-      palette = NULL;
-    }
-    if (palette)
-      M_BITMAPHANDLERDATA->m_bitmapPalette = *palette;
-    return success;
-#else
-  return FALSE;
-#endif
-}
+            p = rowStart;
+            p.OffsetY(data, 1);
 
-bool wxBMPFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal)
-{
-#if USE_IMAGE_LOADING_IN_MSW
-    wxPalette *actualPalette = (wxPalette *)pal;
-    if (!actualPalette && (!M_BITMAPHANDLERDATA->m_bitmapPalette.IsNull()))
-      actualPalette = & (M_BITMAPHANDLERDATA->m_bitmapPalette);
-    return (wxSaveBitmap(WXSTRINGCAST name, bitmap, actualPalette) != 0);
-#else
-  return FALSE;
-#endif
-}
+            pMask = rowStartMask;
+            pMask.OffsetY(dataMask, 1);
+        }
 
+        SetMask(new wxMask(bmpMask));
+    }
 
-void wxBitmap::CleanUpHandlers()
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
+    GWorldPtr gworld = MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap);
+    PixMapHandle hPixMap = GetGWorldPixMap(gworld);
+    if ( hPixMap )
     {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        wxNode *next = node->Next();
-        delete handler;
-        delete node;
-        node = next;
+        UnlockPixels(hPixMap);
     }
 }
 
-void wxBitmap::InitStandardHandlers()
+void wxBitmap::UseAlpha()
 {
-    AddHandler(new wxPICTResourceHandler) ;
-    AddHandler(new wxICONResourceHandler) ;
-    AddHandler(new wxXPMFileHandler);
-#ifdef OBSOLETE_XPM_DATA_HANDLER
-    AddHandler(new wxXPMDataHandler);
-#endif
-    AddHandler(new wxBMPResourceHandler);
-    AddHandler(new wxBMPFileHandler);
+    // remember that we are using alpha channel, we'll need to create a proper
+    // mask in UngetRawData()
+    M_BITMAPDATA->m_hasAlpha = true;
 }
+