don't include windows.h unless neccessary

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

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index fd0f461f173833798c03ad22da21b7a9e10b681b..688ce82584faf0c922851e04d6a7e9de541c4df1 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/src/mac/bitmap.cpp
@@ -10,13 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

+#pragma implementation "bitmapbase.h"

 #pragma implementation "bitmap.h"
 #endif
 
 #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/bitmap.h"
 #include "wx/icon.h"
 #include "wx/log.h"


@@ -30,7 +29,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase , wxGDIObject )
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase, wxObject ) 
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase, wxObject ) 
 #endif
 

-#ifdef __UNIX__
+#ifdef __DARWIN__

     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>
     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>


@@ -94,95 +93,204 @@ void wxMacDestroyGWorld( GWorldPtr gw )
                DisposeGWorld( 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 ) ;

 
 

-               GetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-               SetCPixel( x + portRect.left , y + portRect.top , &col ) ;
-            }
-            else {
-                // With transparency set this sets a blank pixel not a white one
-                SetCPixel( x + portRect.left , y + portRect.top , &white);
-            }
-         }
-      }
-      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 ) ;
+    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 ;
+
+    (**icon).iconBMap.rowBytes = iconSize / 8 ;
+    (**icon).iconBMap.bounds = frame ;
+    (**icon).iconMask.baseAddr = (char*) &(**icon).iconMaskData ;
+    (**icon).iconBMap.baseAddr = (char*) &(**icon).iconMaskData + bwSize ;
+
+    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
+    {
+           LockPixels(GetGWorldPixMap(image));
+      CopyBits(GetPortBitMapForCopyBits(image) ,
+          &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
+      CopyBits(GetPortBitMapForCopyBits(image) ,
+          &(**icon).iconMask , &imageBounds , &imageBounds, 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;         

 
 

-   return pict;                  // return our groovy pict handle
+  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 ;
+  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;                                 

 }
 
 wxBitmapRefData::wxBitmapRefData()
 }
 
 wxBitmapRefData::wxBitmapRefData()


@@ -200,33 +308,34 @@ wxBitmapRefData::wxBitmapRefData()
     m_bitmapType = kMacBitmapTypeUnknownType ;
 }
 
     m_bitmapType = kMacBitmapTypeUnknownType ;
 }
 

-wxBitmapRefData::~wxBitmapRefData()
+// TODO move this do a public function of Bitmap Ref
+static void DisposeBitmapRefData(wxBitmapRefData *data)

 {
 {

-       switch (m_bitmapType)
+       switch (data->m_bitmapType)

        {
                case kMacBitmapTypePict :
                        {
        {
                case kMacBitmapTypePict :
                        {

-                               if ( m_hPict )
+                               if ( data->m_hPict )

                                {
                                {

-                                       KillPicture( m_hPict ) ;
-                                       m_hPict = NULL ;
+                                       KillPicture( data->m_hPict ) ;
+                                       data->m_hPict = NULL ;

                                }
                        }
                        break ;
                case kMacBitmapTypeGrafWorld :
                        {
                                }
                        }
                        break ;
                case kMacBitmapTypeGrafWorld :
                        {

-                               if ( m_hBitmap )
+                               if ( data->m_hBitmap )

                                {
                                {

-                                       wxMacDestroyGWorld( m_hBitmap ) ;
-                                       m_hBitmap = NULL ;
+                                       wxMacDestroyGWorld( data->m_hBitmap ) ;
+                                       data->m_hBitmap = NULL ;

                                }
                        }
                        break ;
                case kMacBitmapTypeIcon :
                                }
                        }
                        break ;
                case kMacBitmapTypeIcon :

-               if ( m_hIcon )
+               if ( data->m_hIcon )

                {
                {

-                       DisposeCIcon( m_hIcon ) ;
-                       m_hIcon = NULL ;
+                       DisposeCIcon( data->m_hIcon ) ;
+                       data->m_hIcon = NULL ;

                }
                
                default :
                }
                
                default :


@@ -234,33 +343,34 @@ wxBitmapRefData::~wxBitmapRefData()
                        break ;
        }
        
                        break ;
        }
        

-  if (m_bitmapMask)
+  if (data->m_bitmapMask)

   {
   {

-    delete m_bitmapMask;
-    m_bitmapMask = NULL;
+    delete data->m_bitmapMask;
+    data->m_bitmapMask = NULL;

   }
 }
 
   }
 }
 

-wxList wxBitmap::sm_handlers;
+wxBitmapRefData::~wxBitmapRefData()
+{
+  DisposeBitmapRefData( this ) ;
+}
+
+wxList wxBitmapBase::sm_handlers;

 
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     Ref(icon) ;
 
 
 bool wxBitmap::CopyFromIcon(const wxIcon& icon)
 {
     Ref(icon) ;

+    return true;

 }
 
 wxBitmap::wxBitmap()
 {
     m_refData = NULL;
 }
 
 wxBitmap::wxBitmap()
 {
     m_refData = NULL;

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::~wxBitmap()
 {
 }
 
 wxBitmap::~wxBitmap()
 {

-    if (wxTheBitmapList)
-        wxTheBitmapList->DeleteObject(this);

 }
 
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
 }
 
 wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)


@@ -322,34 +432,21 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     {
         wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
     }
     {
         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);
 }
 
 wxBitmap::wxBitmap(int w, int h, int d)
 {
     (void)Create(w, h, d);

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 wxBitmap::wxBitmap(void *data, wxBitmapType type, int width, int height, int depth)
 {
     (void) Create(data, type, width, height, 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, wxBitmapType type)
 {
     LoadFile(filename, type);
 }
 
 wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
     LoadFile(filename, type);

-
-    if ( wxTheBitmapList )
-        wxTheBitmapList->AddBitmap(this);

 }
 
 bool wxBitmap::CreateFromXpm(const char **bits)
 }
 
 bool wxBitmap::CreateFromXpm(const char **bits)


@@ -359,7 +456,6 @@ bool wxBitmap::CreateFromXpm(const char **bits)
     wxImage img = decoder.ReadData(bits);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
     *this = wxBitmap(img);   
     wxImage img = decoder.ReadData(bits);
     wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
     *this = wxBitmap(img);   

-    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -438,7 +534,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
            RGBColor  color;
 
            bitmap = GetHBITMAP();
            RGBColor  color;
 
            bitmap = GetHBITMAP();

-           subbitmap = wxMacCreateGWorld(rect.width, rect.height, GetDepth());
+           subbitmap = ref->m_hBitmap ;

            LockPixels(GetGWorldPixMap(bitmap));
            LockPixels(GetGWorldPixMap(subbitmap));
 
            LockPixels(GetGWorldPixMap(bitmap));
            LockPixels(GetGWorldPixMap(subbitmap));
 


@@ -454,7 +550,6 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
            }
            UnlockPixels(GetGWorldPixMap(bitmap));
            UnlockPixels(GetGWorldPixMap(subbitmap));
            }
            UnlockPixels(GetGWorldPixMap(bitmap));
            UnlockPixels(GetGWorldPixMap(subbitmap));

-           ret.SetHBITMAP(subbitmap);

        }
    }
    SetGWorld( origPort, origDevice );
        }
    }
    SetGWorld( origPort, origDevice );


@@ -487,9 +582,11 @@ int wxBitmap::GetBitmapType() const
 
 void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
 
 void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {

+    DisposeBitmapRefData( M_BITMAPDATA ) ;
+    

     M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     M_BITMAPDATA->m_hBitmap = bmp ;
     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, wxBitmapType type)
 }
 
 bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)


@@ -540,63 +637,74 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     m_refData = new wxBitmapRefData();
       
 
     m_refData = new wxBitmapRefData();
       

-    if (wxTheBitmapList) wxTheBitmapList->AddBitmap(this);
-

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

-    Create( width , height , wxDisplayDepth() ) ;
-    wxBitmap maskBitmap( width, height, 1);
+    Create( width , height , 32 ) ;

     
     CGrafPtr origPort ;
     GDHandle origDevice ;
 
     
     CGrafPtr origPort ;
     GDHandle origDevice ;
 

-    LockPixels( GetGWorldPixMap(GetHBITMAP()) );
-    LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
+    PixMapHandle pixMap = GetGWorldPixMap(GetHBITMAP()) ;
+    LockPixels( pixMap );

 
     GetGWorld( &origPort , &origDevice ) ;
     SetGWorld( GetHBITMAP() , NULL ) ;
     
     // Render image
 
     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      };
+    RGBColor colorRGB ;

 
     register unsigned char* data = image.GetData();
 
     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++)
         {
     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.HasMask() )
+    {
+      data = image.GetData(); 
+      
+      wxColour maskcolor(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
+      RGBColor white = { 0xffff, 0xffff, 0xffff };
+      RGBColor black = { 0     , 0     , 0      };
+      wxBitmap maskBitmap ;

 
 

-    // Create mask
-    if ( image.HasMask() ) {
-        SetMask(new wxMask( maskBitmap ));
+      maskBitmap.Create( width, height, 1);
+      LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
+      SetGWorld(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(GetHBITMAP(), NULL);
+      SetMask(new wxMask( maskBitmap ));
+      UnlockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );

     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );

-    UnlockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );

     SetGWorld( origPort, origDevice );
 }
 
     SetGWorld( origPort, origDevice );
 }
 


@@ -842,7 +950,7 @@ PicHandle wxBitmap::GetPict() const
 
    if( mask )
    {
 
    if( mask )
    {

-#ifdef __UNIX__
+#ifdef __DARWIN__

        RGBColor trans = white;
 #else
        RGBBackColor( &gray );
        RGBColor trans = white;
 #else
        RGBBackColor( &gray );