compilation fix for wxUSE_DYNLOAD

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

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index 1a59104b9eaf1bddae5348415d36a282de416be5..ba9371a821be4e1d5f9c2b44478068a588f99344 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/src/mac/bitmap.cpp
@@ -13,22 +13,19 @@
 #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/image.h"
 #include "wx/xpmdecod.h"
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/log.h"
 #include "wx/image.h"
 #include "wx/xpmdecod.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 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>
     #include <ApplicationServices/ApplicationServices.h>
 #else
     #include <PictUtils.h>


@@ -38,149 +35,258 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 CTabHandle wxMacCreateColorTable( int numColors )
 {
 
 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 )
 {
 }
 
 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 = 0 ;// someRedValue;
+    (**newColors).ctTable[index].rgb.green = 0 ; // someGreenValue;
+    (**newColors).ctTable[index].rgb.blue = 0 ; // someBlueValue;

 }
 
 GWorldPtr wxMacCreateGWorld( int width , int height , int depth )
 {
 }
 
 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 )
 {
 }
 
 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;
+
+    GetGWorld(&saveWorld,&saveHandle);      // save Graphics env state
+    SetGWorld(image,nil);
+
+    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 ;

 
 

-   if ( maskimage )
-   {
-      RGBForeColor( &black ) ;
-      RGBBackColor( &white ) ;
-      PenMode(transparent);
+    (**icon).iconBMap.rowBytes = iconSize / 8 ;
+    (**icon).iconBMap.bounds = frame ;
+    (**icon).iconMask.baseAddr = (char*) &(**icon).iconMaskData ;
+    (**icon).iconBMap.baseAddr = (char*) &(**icon).iconMaskData + bwSize ;

 
 

-      for ( int y = 0 ; y < height ; ++y )
-      {
-         for( int x = 0 ; x < width ; ++x )
-         {
-            if ( maskimage[y*width + x] )
-            {
-               RGBColor col ;
+    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;
+}

 
 

-               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 ) ;
+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 ;
+  GetPortBounds( wp , &portRect ) ;

 
 

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


@@ -198,61 +304,66 @@ 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)
-       {
-               case kMacBitmapTypePict :
-                       {
-                               if ( m_hPict )
-                               {
-                                       KillPicture( m_hPict ) ;
-                                       m_hPict = NULL ;
-                               }
-                       }
-                       break ;
-               case kMacBitmapTypeGrafWorld :
-                       {
-                               if ( m_hBitmap )
-                               {
-                                       wxMacDestroyGWorld( m_hBitmap ) ;
-                                       m_hBitmap = NULL ;
-                               }
-                       }
-                       break ;
-               case kMacBitmapTypeIcon :
-               if ( m_hIcon )
-               {
-                       DisposeCIcon( m_hIcon ) ;
-                       m_hIcon = NULL ;
-               }
-               
-               default :
-                       // unkown type ?
-                       break ;
-       }
-       
-  if (m_bitmapMask)
+    switch (data->m_bitmapType)
+    {
+        case kMacBitmapTypePict :
+            {
+                if ( data->m_hPict )
+                {
+                    KillPicture( data->m_hPict ) ;
+                    data->m_hPict = NULL ;
+                }
+            }
+            break ;
+        case kMacBitmapTypeGrafWorld :
+            {
+                if ( data->m_hBitmap )
+                {
+                    wxMacDestroyGWorld( data->m_hBitmap ) ;
+                    data->m_hBitmap = NULL ;
+                }
+            }
+            break ;
+        case kMacBitmapTypeIcon :
+            if ( data->m_hIcon )
+            {
+                DisposeCIcon( data->m_hIcon ) ;
+                data->m_hIcon = NULL ;
+            }
+        
+        default :
+            // unkown type ?
+            break ;
+    }
+    
+  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 ) ;
+}
+
+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)


@@ -268,27 +379,27 @@ 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 ) ;
         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 ;
-       
+    
+        CGrafPtr    origPort ;
+        GDHandle    origDevice ;
+    

         GetGWorld( &origPort , &origDevice ) ;
         SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ;
         LockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
         GetGWorld( &origPort , &origDevice ) ;
         SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ;
         LockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;

-       
+    

         // bits is a char array
         // 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);
         }
         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 } 
         } ;
         RGBColor colors[2] = { 
             { 0xFFFF , 0xFFFF , 0xFFFF } ,
             { 0, 0 , 0 } 
         } ;

-       
+    

         for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
         {
             for ( int x = 0 ; x < the_width ; ++x )
         for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
         {
             for ( int x = 0 ; x < the_width ; ++x )


@@ -307,41 +418,28 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
             }
         }
         UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
             }
         }
         UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;

-       
+    

         SetGWorld( origPort , origDevice ) ;
     }
     else
     {
         wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
     }
         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);
 }
 
 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)


@@ -351,7 +449,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;
 }
 


@@ -430,7 +527,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));
 


@@ -446,7 +543,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 );


@@ -479,9 +575,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)


@@ -492,7 +590,7 @@ bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
 
     if ( handler )
     {
 
     if ( handler )
     {

-       m_refData = new wxBitmapRefData;
+        m_refData = new wxBitmapRefData;

 
         return handler->LoadFile(this, filename, type, -1, -1);
     }
 
         return handler->LoadFile(this, filename, type, -1, -1);
     }


@@ -532,63 +630,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 ;
+
+      maskBitmap.Create( width, height, 1);
+      LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
+      SetGWorld(maskBitmap.GetHBITMAP(), NULL);

 
 

-    // Create mask
-    if ( image.HasMask() ) {
-        SetMask(new wxMask( maskBitmap ));
+      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 );
 }
 


@@ -834,7 +943,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 );


@@ -885,68 +994,6 @@ PicHandle wxBitmap::GetPict() const
    return picture;                  // return our groovy pict handle
 }
 
    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, wxBitmapType type)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if ( handler->GetExtension() == extension &&
-                    (type == -1 || handler->GetType() == type) )
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
-
-wxBitmapHandler *wxBitmap::FindHandler(wxBitmapType type)
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
-    {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        if (handler->GetType() == type)
-            return handler;
-        node = node->Next();
-    }
-    return NULL;
-}
-

 /*
  * wxMask
  */
 /*
  * wxMask
  */


@@ -981,11 +1028,11 @@ wxMask::wxMask(const wxBitmap& bitmap)
 
 wxMask::~wxMask()
 {
 
 wxMask::~wxMask()
 {

-       if ( m_maskBitmap )
-       {
-               wxMacDestroyGWorld( m_maskBitmap ) ;
-               m_maskBitmap = NULL ;
-       }
+    if ( m_maskBitmap )
+    {
+        wxMacDestroyGWorld( m_maskBitmap ) ;
+        m_maskBitmap = NULL ;
+    }

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


@@ -1032,52 +1079,52 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 // 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( m_maskBitmap ) ;
+        m_maskBitmap = NULL ;
+    }
+    wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,

                  wxT("Cannot create mask from this bitmap type (TODO)"));
                  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"));
 
     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 ); 
+    LockPixels( GetGWorldPixMap( m_maskBitmap ) );
+    LockPixels( GetGWorldPixMap( bitmap.GetHBITMAP() ) );
+    RGBColor maskColor = colour.GetPixel();

 
     // this is not very efficient, but I can't think
     // of a better way of doing it
 
     // 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 }};
     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++)
     {
         for (int h = 0; h < bitmap.GetHeight(); h++)

-        {              
-                       SetGWorld( bitmap.GetHBITMAP(), NULL ) ;
-                       GetCPixel( w , h , &col ) ;
-                       SetGWorld( m_maskBitmap , NULL ) ;
+        {       
+            SetGWorld( bitmap.GetHBITMAP(), NULL ) ;
+            GetCPixel( w , h , &col ) ;
+            SetGWorld( m_maskBitmap , NULL ) ;

             if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
             {
             if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
             {

-                               SetCPixel( w , h , &colors[0] ) ;
+                SetCPixel( w , h , &colors[0] ) ;

             }
             else
             {
             }
             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( bitmap.GetHBITMAP() ) ) ;
+    SetGWorld( origPort , origDevice ) ;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1107,8 +1154,6 @@ bool wxMask::PointMasked(int x, int y)
  * wxBitmapHandler
  */
 
  * wxBitmapHandler
  */
 

-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-

 bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
 {
     return FALSE;
 bool wxBitmapHandler::Create(wxBitmap *bitmap, void *data, long type, int width, int height, int depth)
 {
     return FALSE;


@@ -1148,69 +1193,35 @@ 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 flags,
           int desiredWidth, int desiredHeight)
 {

-       Str255 theName ;
-       
+    Str255 theName ;
+    

 #if TARGET_CARBON
 #if TARGET_CARBON

-       c2pstrcpy( (StringPtr) theName , name ) ;
+    c2pstrcpy( (StringPtr) theName , name ) ;

 #else
 #else

-       strcpy( (char *) theName , name ) ;
-       c2pstr( (char *)theName ) ;
+    strcpy( (char *) theName , name ) ;
+    c2pstr( (char *)theName ) ;

 #endif
 #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 ;
-}
-
-#if 0   // The following is an example for creating a bitmap handler
-
-// 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;
-    };
-
-    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-          int desiredWidth, int desiredHeight);
-};
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-
-#endif
-
-void wxBitmap::CleanUpHandlers()
-{
-    wxNode *node = sm_handlers.First();
-    while ( node )
+    
+    PicHandle thePict = (PicHandle ) GetNamedResource( 'PICT' , theName ) ;
+    if ( thePict )

     {
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        wxNode *next = node->Next();
-        delete handler;
-        delete node;
-        node = next;
+        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 ;

 }
 
 void wxBitmap::InitStandardHandlers()
 }
 
 void wxBitmap::InitStandardHandlers()