Make wxr resources work in Unicode mode.

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index ba9371a821be4e1d5f9c2b44478068a588f99344..cd1c398c99df8882a16750720629cbdd5fe72a72 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -59,9 +59,9 @@ void wxMacDestroyColorTable( CTabHandle colors )
 void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue )
 {
     (**newColors).ctTable[index].value = index;
 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].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 )
 }
 
 GWorldPtr wxMacCreateGWorld( int width , int height , int depth )


@@ -218,20 +218,24 @@ CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth ,
 
     if ( mask )
     {
 
     if ( mask )
     {

+       Rect r ;
+       GetPortBounds( image , &r ) ;

       LockPixels(GetGWorldPixMap(mask) ) ;
       CopyBits(GetPortBitMapForCopyBits(mask) ,
       LockPixels(GetGWorldPixMap(mask) ) ;
       CopyBits(GetPortBitMapForCopyBits(mask) ,

-          &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
+          &(**icon).iconBMap , &r , &r, srcCopy , nil ) ;

       CopyBits(GetPortBitMapForCopyBits(mask) ,
       CopyBits(GetPortBitMapForCopyBits(mask) ,

-          &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
+          &(**icon).iconMask , &r , &r, srcCopy , nil ) ;

       UnlockPixels(GetGWorldPixMap( mask ) ) ;
     }
     else
     {
       UnlockPixels(GetGWorldPixMap( mask ) ) ;
     }
     else
     {

+       Rect r ;
+       GetPortBounds( image , &r ) ;

         LockPixels(GetGWorldPixMap(image));
       CopyBits(GetPortBitMapForCopyBits(image) ,
         LockPixels(GetGWorldPixMap(image));
       CopyBits(GetPortBitMapForCopyBits(image) ,

-          &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
+          &(**icon).iconBMap , &r , &r, srcCopy , nil ) ;

       CopyBits(GetPortBitMapForCopyBits(image) ,
       CopyBits(GetPortBitMapForCopyBits(image) ,

-          &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
+          &(**icon).iconMask , &r , &r, srcCopy , nil ) ;

         UnlockPixels(GetGWorldPixMap(image));
     }
     
         UnlockPixels(GetGWorldPixMap(image));
     }
     


@@ -268,14 +272,19 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
     
   SetGWorld( wp , NULL ) ;
   Rect portRect ;
     
   SetGWorld( wp , NULL ) ;
   Rect portRect ;

-  GetPortBounds( wp , &portRect ) ;
-
+  if ( clipRgn )
+    GetRegionBounds( clipRgn , &portRect ) ;   
+  else
+       GetPortBounds( wp , &portRect ) ;

   pict = OpenPicture(&portRect);   
   if(pict)  
   {
     RGBForeColor( &black ) ;
     RGBBackColor( &white ) ;
   pict = OpenPicture(&portRect);   
   if(pict)  
   {
     RGBForeColor( &black ) ;
     RGBBackColor( &white ) ;

-
+    
+    if ( clipRgn )
+       SetClip( clipRgn ) ;
+    

     LockPixels( GetGWorldPixMap( wp ) ) ;
     CopyBits(GetPortBitMapForCopyBits(wp),          
             GetPortBitMapForCopyBits(wp),       
     LockPixels( GetGWorldPixMap( wp ) ) ;
     CopyBits(GetPortBitMapForCopyBits(wp),          
             GetPortBitMapForCopyBits(wp),       


@@ -286,17 +295,70 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
     ClosePicture();                 
   }
   SetGWorld( origPort , origDev ) ;
     ClosePicture();                 
   }
   SetGWorld( origPort , origDev ) ;

+  if ( clipRgn )
+       DisposeRgn( clipRgn ) ;

   return pict;                  
 }
 
   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
+            {
+                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 ) ;
+                }
+            }
+        }
+               else if ( bmap->m_bitmapType == kMacBitmapTypeIcon )
+               {
+               info->contentType = kControlContentCIconHandle ;
+               info->u.cIconHandle = MAC_WXHICON(bmap->m_hIcon) ;
+               }
+    }
+}
+

 wxBitmapRefData::wxBitmapRefData()
 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_bitmapMask = NULL;
     m_hBitmap = NULL ;
     m_hPict = NULL ;


@@ -304,7 +366,7 @@ wxBitmapRefData::wxBitmapRefData()
     m_bitmapType = kMacBitmapTypeUnknownType ;
 }
 
     m_bitmapType = kMacBitmapTypeUnknownType ;
 }
 

-// TODO move this do a public function of Bitmap Ref
+// TODO move this to a public function of Bitmap Ref

 static void DisposeBitmapRefData(wxBitmapRefData *data)
 {
     switch (data->m_bitmapType)
 static void DisposeBitmapRefData(wxBitmapRefData *data)
 {
     switch (data->m_bitmapType)


@@ -313,7 +375,7 @@ static void DisposeBitmapRefData(wxBitmapRefData *data)
             {
                 if ( data->m_hPict )
                 {
             {
                 if ( data->m_hPict )
                 {

-                    KillPicture( data->m_hPict ) ;
+                    KillPicture( MAC_WXHMETAFILE( data->m_hPict ) ) ;

                     data->m_hPict = NULL ;
                 }
             }
                     data->m_hPict = NULL ;
                 }
             }


@@ -322,7 +384,7 @@ static void DisposeBitmapRefData(wxBitmapRefData *data)
             {
                 if ( data->m_hBitmap )
                 {
             {
                 if ( data->m_hBitmap )
                 {

-                    wxMacDestroyGWorld( data->m_hBitmap ) ;
+                    wxMacDestroyGWorld( MAC_WXHBITMAP(data->m_hBitmap) ) ;

                     data->m_hBitmap = NULL ;
                 }
             }
                     data->m_hBitmap = NULL ;
                 }
             }


@@ -330,7 +392,7 @@ static void DisposeBitmapRefData(wxBitmapRefData *data)
         case kMacBitmapTypeIcon :
             if ( data->m_hIcon )
             {
         case kMacBitmapTypeIcon :
             if ( data->m_hIcon )
             {

-                DisposeCIcon( data->m_hIcon ) ;
+                DisposeCIcon( MAC_WXHICON(data->m_hIcon) ) ;

                 data->m_hIcon = NULL ;
             }
         
                 data->m_hIcon = NULL ;
             }
         


@@ -377,15 +439,15 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     if ( no_bits == 1 )
     {
         M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     if ( no_bits == 1 )
     {
         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 ) ;
+        MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
+        M_BITMAPDATA->m_ok = (MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) != NULL ) ;

     
         CGrafPtr    origPort ;
         GDHandle    origDevice ;
     
         GetGWorld( &origPort , &origDevice ) ;
     
         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
     
     
         // bits is a char array
     


@@ -417,7 +479,7 @@ 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 ) ;
     }
     
         SetGWorld( origPort , origDevice ) ;
     }


@@ -474,7 +536,7 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
    wxBitmap ret( rect.width, rect.height, GetDepth() );
    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 
    wxBitmap ret( rect.width, rect.height, GetDepth() );
    wxASSERT_MSG( ret.Ok(), wxT("GetSubBitmap error") );
 

-   WXHBITMAP origPort;
+   GWorldPtr origPort;

    GDHandle  origDevice;
 
    GetGWorld( &origPort, &origDevice );
    GDHandle  origDevice;
 
    GetGWorld( &origPort, &origDevice );


@@ -496,10 +558,10 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
        // Copy mask
        if(GetMask())
        {
        // Copy mask
        if(GetMask())
        {

-           WXHBITMAP submask, mask;
+           GWorldPtr submask, mask;

            RGBColor  color;
 
            RGBColor  color;
 

-           mask = GetMask()->GetMaskBitmap();
+           mask = (GWorldPtr) GetMask()->GetMaskBitmap();

            submask = wxMacCreateGWorld(rect.width, rect.height, 1);
            LockPixels(GetGWorldPixMap(mask));
            LockPixels(GetGWorldPixMap(submask));
            submask = wxMacCreateGWorld(rect.width, rect.height, 1);
            LockPixels(GetGWorldPixMap(mask));
            LockPixels(GetGWorldPixMap(submask));


@@ -523,11 +585,11 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
        // Copy bitmap
        if(GetHBITMAP())
        {
        // Copy bitmap
        if(GetHBITMAP())
        {

-           WXHBITMAP subbitmap, bitmap;
+           GWorldPtr subbitmap, bitmap;

            RGBColor  color;
 
            RGBColor  color;
 

-           bitmap = GetHBITMAP();
-           subbitmap = ref->m_hBitmap ;
+           bitmap = (GWorldPtr) GetHBITMAP();
+           subbitmap = (GWorldPtr) ref->m_hBitmap ;

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


@@ -562,7 +624,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_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;
 }
 
     return M_BITMAPDATA->m_ok;
 }
 


@@ -579,7 +641,7 @@ void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
     
     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)


@@ -641,15 +703,13 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
     CGrafPtr origPort ;
     GDHandle origDevice ;
 
     CGrafPtr origPort ;
     GDHandle origDevice ;
 

-    PixMapHandle pixMap = GetGWorldPixMap(GetHBITMAP()) ;
+    PixMapHandle pixMap = GetGWorldPixMap((GWorldPtr)GetHBITMAP()) ;

     LockPixels( pixMap );
 
     GetGWorld( &origPort , &origDevice ) ;
     LockPixels( pixMap );
 
     GetGWorld( &origPort , &origDevice ) ;

-    SetGWorld( GetHBITMAP() , NULL ) ;
+    SetGWorld( (GWorldPtr) GetHBITMAP() , NULL ) ;

     
     // Render image
     
     // Render image

-    RGBColor colorRGB ;
-

     register unsigned char* data = image.GetData();
     char* destinationBase = GetPixBaseAddr( pixMap );
     register unsigned char* destination = (unsigned char*) destinationBase ;
     register unsigned char* data = image.GetData();
     char* destinationBase = GetPixBaseAddr( pixMap );
     register unsigned char* destination = (unsigned char*) destinationBase ;


@@ -675,8 +735,8 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
       wxBitmap maskBitmap ;
 
       maskBitmap.Create( width, height, 1);
       wxBitmap maskBitmap ;
 
       maskBitmap.Create( width, height, 1);

-      LockPixels( GetGWorldPixMap(maskBitmap.GetHBITMAP()) );
-      SetGWorld(maskBitmap.GetHBITMAP(), NULL);
+      LockPixels( GetGWorldPixMap( (GWorldPtr) maskBitmap.GetHBITMAP()) );
+      SetGWorld( (GWorldPtr) maskBitmap.GetHBITMAP(), NULL);

 
       for (int y = 0; y < height; y++)
       {
 
       for (int y = 0; y < height; y++)
       {


@@ -692,12 +752,12 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
               data += 3 ;
           }
       }  // for height
               data += 3 ;
           }
       }  // for height

-      SetGWorld(GetHBITMAP(), NULL);
+      SetGWorld( (GWorldPtr) GetHBITMAP(), NULL);

       SetMask(new wxMask( maskBitmap ));
       SetMask(new wxMask( maskBitmap ));

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

     }
     
     }
     

-    UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
+    UnlockPixels( GetGWorldPixMap( (GWorldPtr) GetHBITMAP()) );

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


@@ -716,8 +776,10 @@ wxImage wxBitmap::ConvertToImage() const
 
     wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
 
 
     wxCHECK_MSG( data, wxNullImage, wxT("Could not allocate data for image") );
 

-    WXHBITMAP origPort;
+    GWorldPtr origPort;

     GDHandle  origDevice;
     GDHandle  origDevice;

+    RgnHandle maskRgn = NULL ;
+    GWorldPtr tempPort = NULL ;

     int      index;
     RGBColor color;
     // background color set to RGB(16,16,16) in consistent with wxGTK
     int      index;
     RGBColor color;
     // background color set to RGB(16,16,16) in consistent with wxGTK


@@ -726,9 +788,28 @@ wxImage wxBitmap::ConvertToImage() const
     wxMask  *mask = GetMask();
 
     GetGWorld( &origPort, &origDevice );
     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++)
     // Copy data into image
     index = 0;
     for (int yy = 0; yy < height; yy++)


@@ -742,27 +823,50 @@ wxImage wxBitmap::ConvertToImage() const
             data[index    ] = r;
             data[index + 1] = g;
             data[index + 2] = b;
             data[index    ] = r;
             data[index + 1] = g;
             data[index + 2] = b;

-            if (mask)
-            {
-                if (mask->PointMasked(xx,yy))
-                {
+            if ( maskRgn )
+            {  
+               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;
                     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;
         }
     }
             }
             index += 3;
         }
     }

-    if (mask)
+    if (mask || maskRgn )

     {
         image.SetMaskColour( mask_r, mask_g, mask_b );
         image.SetMask( true );
     }
 
     // Free resources
     {
         image.SetMaskColour( mask_r, mask_g, mask_b );
         image.SetMask( true );
     }
 
     // Free resources

-    UnlockPixels(GetGWorldPixMap(GetHBITMAP()));
+    UnlockPixels(GetGWorldPixMap( tempPort ));

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

+    if ( GetBitmapType() != kMacBitmapTypeGrafWorld )
+    {
+       wxMacDestroyGWorld( tempPort ) ;
+    }
+    if ( maskRgn )
+    {
+       DisposeRgn( maskRgn ) ;
+    }

 
     return image;
 }
 
     return image;
 }


@@ -899,10 +1003,10 @@ WXHBITMAP wxBitmap::GetHBITMAP() const
 {
    wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
 
 {
    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() const

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


@@ -925,16 +1029,16 @@ PicHandle wxBitmap::GetPict() const
    wxMask   *mask;
    Rect      portRect ;
 
    wxMask   *mask;
    Rect      portRect ;
 

-   GetPortBounds( GetHBITMAP() , &portRect ) ;
+   GetPortBounds(  (GWorldPtr) GetHBITMAP() , &portRect ) ;

    int width = portRect.right - portRect.left ;
    int height = portRect.bottom - portRect.top ;
 
    int width = portRect.right - portRect.left ;
    int height = portRect.bottom - portRect.top ;
 

-   LockPixels( GetGWorldPixMap( GetHBITMAP() ) ) ;
+   LockPixels( GetGWorldPixMap(  (GWorldPtr) GetHBITMAP() ) ) ;

    GetGWorld( &origPort , &origDev ) ;
 
    mask = GetMask();
 
    GetGWorld( &origPort , &origDev ) ;
 
    mask = GetMask();
 

-   SetGWorld( GetHBITMAP() , NULL ) ;
+   SetGWorld(  (GWorldPtr) GetHBITMAP() , NULL ) ;

 
    picture = OpenPicture(&portRect);   // open a picture, this disables drawing
    if(!picture) {
 
    picture = OpenPicture(&portRect);   // open a picture, this disables drawing
    if(!picture) {


@@ -979,16 +1083,16 @@ PicHandle wxBitmap::GetPict() const
        RGBForeColor( &black ) ;
        RGBBackColor( &white ) ;
 
        RGBForeColor( &black ) ;
        RGBBackColor( &white ) ;
 

-       CopyBits(GetPortBitMapForCopyBits(GetHBITMAP()), 
+       CopyBits(GetPortBitMapForCopyBits( (GWorldPtr) GetHBITMAP()), 

                 // src PixMap - we copy image over itself -
                 // src PixMap - we copy image over itself -

-                GetPortBitMapForCopyBits(GetHBITMAP()),
+                GetPortBitMapForCopyBits( (GWorldPtr) GetHBITMAP()),

                 //  dst PixMap - no drawing occurs
                 &portRect,    // srcRect - it will be recorded and compressed -
                 &portRect,    // dstRect - into the picture that is open -
                 srcCopy,NULL); // copyMode and no clip region
    }
    ClosePicture();                  // We are done recording the picture
                 //  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() ) ) ;
+   UnlockPixels( GetGWorldPixMap(  (GWorldPtr) GetHBITMAP() ) ) ;

    SetGWorld( origPort , origDev ) ;
 
    return picture;                  // return our groovy pict handle
    SetGWorld( origPort , origDev ) ;
 
    return picture;                  // return our groovy pict handle


@@ -999,30 +1103,30 @@ PicHandle wxBitmap::GetPict() const
  */
 
 wxMask::wxMask()
  */
 
 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)
 }
 
 // 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)
     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)
     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);
 }
 
     Create(bitmap);
 }
 


@@ -1030,7 +1134,7 @@ wxMask::~wxMask()
 {
     if ( m_maskBitmap )
     {
 {
     if ( m_maskBitmap )
     {

-        wxMacDestroyGWorld( m_maskBitmap ) ;
+        wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;

         m_maskBitmap = NULL ;
     }
 }
         m_maskBitmap = NULL ;
     }
 }


@@ -1040,7 +1144,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
 {
    if ( m_maskBitmap )
    {
 {
    if ( m_maskBitmap )
    {

-       wxMacDestroyGWorld( m_maskBitmap ) ;
+       wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;

        m_maskBitmap = NULL ;
    }
    wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
        m_maskBitmap = NULL ;
    }
    wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,


@@ -1055,13 +1159,13 @@ bool wxMask::Create(const wxBitmap& bitmap)
    m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
    Rect rect = { 0,0, bitmap.GetHeight(), bitmap.GetWidth() };
 
    m_maskBitmap = wxMacCreateGWorld(bitmap.GetWidth(), bitmap.GetHeight(), 1);
    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);
             &rect, &rect, srcCopy, 0);

-   UnlockPixels( GetGWorldPixMap(m_maskBitmap) );
-   UnlockPixels( GetGWorldPixMap(bitmap.GetHBITMAP()) );
+   UnlockPixels( GetGWorldPixMap( (GWorldPtr) m_maskBitmap) );
+   UnlockPixels( GetGWorldPixMap( (GWorldPtr) bitmap.GetHBITMAP()) );

 
    return FALSE;
 }
 
    return FALSE;
 }


@@ -1070,8 +1174,8 @@ bool wxMask::Create(const wxBitmap& bitmap)
 // the transparent area
 bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 {
 // 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;
 }
 
     return FALSE;
 }
 


@@ -1081,7 +1185,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
     if ( m_maskBitmap )
     {
 {
     if ( m_maskBitmap )
     {

-        wxMacDestroyGWorld( m_maskBitmap ) ;
+        wxMacDestroyGWorld(  (GWorldPtr) m_maskBitmap ) ;

         m_maskBitmap = NULL ;
     }
     wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,
         m_maskBitmap = NULL ;
     }
     wxCHECK_MSG( bitmap.GetBitmapType() == kMacBitmapTypeGrafWorld, false,


@@ -1091,9 +1195,9 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
     wxCHECK_MSG( bitmap.Ok(), false, wxT("Illigal bitmap"));
 
     m_maskBitmap = wxMacCreateGWorld( bitmap.GetWidth() , bitmap.GetHeight() , 1 ); 
     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();
+    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
 
     // this is not very efficient, but I can't think
     // of a better way of doing it


@@ -1109,9 +1213,9 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
     {
         for (int h = 0; h < bitmap.GetHeight(); h++)
         {       
     {
         for (int h = 0; h < bitmap.GetHeight(); h++)
         {       

-            SetGWorld( bitmap.GetHBITMAP(), NULL ) ;
+            SetGWorld(  (GWorldPtr) bitmap.GetHBITMAP(), NULL ) ;

             GetCPixel( w , h , &col ) ;
             GetCPixel( w , h , &col ) ;

-            SetGWorld( m_maskBitmap , NULL ) ;
+            SetGWorld(  (GWorldPtr) m_maskBitmap , NULL ) ;

             if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
             {
                 SetCPixel( w , h , &colors[0] ) ;
             if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
             {
                 SetCPixel( w , h , &colors[0] ) ;


@@ -1123,7 +1227,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
         }
     }
     UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ;
         }
     }
     UnlockPixels( GetGWorldPixMap( (CGrafPtr) m_maskBitmap ) ) ;

-    UnlockPixels( GetGWorldPixMap( bitmap.GetHBITMAP() ) ) ;
+    UnlockPixels( GetGWorldPixMap(  (GWorldPtr) bitmap.GetHBITMAP() ) ) ;

     SetGWorld( origPort , origDevice ) ;
 
     return TRUE;
     SetGWorld( origPort , origDevice ) ;
 
     return TRUE;


@@ -1131,7 +1235,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
 bool wxMask::PointMasked(int x, int y)
 {
 
 bool wxMask::PointMasked(int x, int y)
 {

-   WXHBITMAP origPort;
+   GWorldPtr origPort;

    GDHandle  origDevice;
    RGBColor  color;
    bool masked = true;
    GDHandle  origDevice;
    RGBColor  color;
    bool masked = true;


@@ -1139,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 )
    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);
    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);
 
 
    SetGWorld( origPort, origDevice);
 


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

+wxBitmapHandler::~wxBitmapHandler()
+{
+}
+

 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;