don't allow clicking disabled buttons

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 8d7cf8f4b9df7d58a8a5577bb4a39aa0acbc22e6..394ba8c7335eb865c067f07cf2ccae4275d9a5fa 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "bitmapbase.h"

 #pragma implementation "bitmap.h"
 #endif
 
 #pragma implementation "bitmap.h"
 #endif
 


@@ -36,75 +35,75 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, 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 ) ;

 }
 
 #define kDefaultRes 0x00480000 /* Default resolution is 72 DPI; Fixed type */
 
 OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect  *bounds , CTabHandle colors )
 {
 }
 
 #define kDefaultRes 0x00480000 /* Default resolution is 72 DPI; Fixed type */
 
 OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect  *bounds , CTabHandle colors )
 {

-    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 */
+    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 */

 
 
     error = noErr;
     newColors = nil;
     offBaseAddr = nil;
 
 
 
     error = noErr;
     newColors = nil;
     offBaseAddr = nil;
 

-       bytesPerRow = ((depth * (bounds->right - bounds->left) + 31) / 32) * 4;
+    bytesPerRow = ((depth * (bounds->right - bounds->left) + 31) / 32) * 4;

 
    /* Clone the clut if indexed color; allocate a dummy clut if direct color*/
     if (depth <= 8)
 
    /* Clone the clut if indexed color; allocate a dummy clut if direct color*/
     if (depth <= 8)


@@ -180,15 +179,15 @@ OSErr SetupCIconHandlePixMap( CIconHandle icon , short depth , Rect  *bounds , C
 
 CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  )
 {
 
 CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  )
 {

-       GWorldPtr               saveWorld;
-       GDHandle                saveHandle;
+    GWorldPtr       saveWorld;
+    GDHandle        saveHandle;

 
 

-       GetGWorld(&saveWorld,&saveHandle);              // save Graphics env state
-       SetGWorld(image,nil);
+    GetGWorld(&saveWorld,&saveHandle);      // save Graphics env state
+    SetGWorld(image,nil);

 
     Rect frame = { 0 , 0 , iconSize , iconSize } ;
     Rect imageBounds = frame ;
 
     Rect frame = { 0 , 0 , iconSize , iconSize } ;
     Rect imageBounds = frame ;

-       GetPortBounds( image , &imageBounds ) ;
+    GetPortBounds( image , &imageBounds ) ;

 
     int bwSize = iconSize / 8 * iconSize ;
     CIconHandle icon = (CIconHandle) NewHandleClear( sizeof ( CIcon ) + 2 * bwSize) ;
 
     int bwSize = iconSize / 8 * iconSize ;
     CIconHandle icon = (CIconHandle) NewHandleClear( sizeof ( CIcon ) + 2 * bwSize) ;


@@ -197,16 +196,16 @@ CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth ,
     HLock( (**icon).iconData ) ;
     (**icon).iconPMap.baseAddr = *(**icon).iconData ;
 
     HLock( (**icon).iconData ) ;
     (**icon).iconPMap.baseAddr = *(**icon).iconData ;
 

-       LockPixels(GetGWorldPixMap(image));
-                       
-       CopyBits(GetPortBitMapForCopyBits(image),
-                               (BitMapPtr)&((**icon).iconPMap),
-                               &imageBounds,
-                               &imageBounds,
-                               srcCopy | ditherCopy, nil);
+    LockPixels(GetGWorldPixMap(image));
+            
+    CopyBits(GetPortBitMapForCopyBits(image),
+                (BitMapPtr)&((**icon).iconPMap),
+                &imageBounds,
+                &imageBounds,
+                srcCopy | ditherCopy, nil);

  
  
  
  

-       UnlockPixels(GetGWorldPixMap(image));
+    UnlockPixels(GetGWorldPixMap(image));

     HUnlock( (**icon).iconData ) ;
     
     (**icon).iconMask.rowBytes = iconSize / 8 ;
     HUnlock( (**icon).iconData ) ;
     
     (**icon).iconMask.rowBytes = iconSize / 8 ;


@@ -228,21 +227,21 @@ CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth ,
     }
     else
     {
     }
     else
     {

-           LockPixels(GetGWorldPixMap(image));
+        LockPixels(GetGWorldPixMap(image));

       CopyBits(GetPortBitMapForCopyBits(image) ,
           &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
       CopyBits(GetPortBitMapForCopyBits(image) ,
           &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;
       CopyBits(GetPortBitMapForCopyBits(image) ,
           &(**icon).iconBMap , &imageBounds , &imageBounds, srcCopy , nil ) ;
       CopyBits(GetPortBitMapForCopyBits(image) ,
           &(**icon).iconMask , &imageBounds , &imageBounds, srcCopy , nil ) ;

-           UnlockPixels(GetGWorldPixMap(image));
+        UnlockPixels(GetGWorldPixMap(image));

     }
     
     (**icon).iconMask.baseAddr = NULL ;
     (**icon).iconBMap.baseAddr = NULL ;
     (**icon).iconPMap.baseAddr = NULL ;
     HUnlock((Handle)icon) ;
     }
     
     (**icon).iconMask.baseAddr = NULL ;
     (**icon).iconBMap.baseAddr = NULL ;
     (**icon).iconPMap.baseAddr = NULL ;
     HUnlock((Handle)icon) ;

-       SetGWorld(saveWorld,saveHandle);
-       
-       return icon;
+    SetGWorld(saveWorld,saveHandle);
+    
+    return icon;

 }
 
 PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
 }
 
 PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)


@@ -266,28 +265,79 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
     BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( mask ) ) ;
     UnlockPixels( GetGWorldPixMap( mask ) ) ;
   }
     BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( mask ) ) ;
     UnlockPixels( GetGWorldPixMap( mask ) ) ;
   }

-       
+    

   SetGWorld( wp , NULL ) ;
   Rect portRect ;
   GetPortBounds( wp , &portRect ) ;
 
   pict = OpenPicture(&portRect);   
   SetGWorld( wp , NULL ) ;
   Rect portRect ;
   GetPortBounds( wp , &portRect ) ;
 
   pict = OpenPicture(&portRect);   

-  if(pict)     
+  if(pict)  

   {
     RGBForeColor( &black ) ;
     RGBBackColor( &white ) ;
 
     LockPixels( GetGWorldPixMap( wp ) ) ;
   {
     RGBForeColor( &black ) ;
     RGBBackColor( &white ) ;
 
     LockPixels( GetGWorldPixMap( wp ) ) ;

-    CopyBits(GetPortBitMapForCopyBits(wp),                     
-               GetPortBitMapForCopyBits(wp),           
-               &portRect,                      
-               &portRect,                      
-               srcCopy,clipRgn);               
+    CopyBits(GetPortBitMapForCopyBits(wp),          
+            GetPortBitMapForCopyBits(wp),       
+            &portRect,          
+            &portRect,          
+            srcCopy,clipRgn);       

     UnlockPixels( GetGWorldPixMap( wp ) ) ;
     UnlockPixels( GetGWorldPixMap( wp ) ) ;

-    ClosePicture();                                    
+    ClosePicture();                 

   }
   SetGWorld( origPort , origDev ) ;
   }
   SetGWorld( origPort , origDev ) ;

-  return pict;                                 
+  return pict;                  
+}
+
+void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap ) 
+{
+    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 ( (bmap->m_width == bmap->m_height) && (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()


@@ -308,38 +358,38 @@ wxBitmapRefData::wxBitmapRefData()
 // TODO move this do a public function of Bitmap Ref
 static void DisposeBitmapRefData(wxBitmapRefData *data)
 {
 // TODO move this do a public function of Bitmap Ref
 static void DisposeBitmapRefData(wxBitmapRefData *data)
 {

-       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 ;
-       }
-       
+    switch (data->m_bitmapType)
+    {
+        case kMacBitmapTypePict :
+            {
+                if ( data->m_hPict )
+                {
+                    KillPicture( MAC_WXHMETAFILE( data->m_hPict ) ) ;
+                    data->m_hPict = NULL ;
+                }
+            }
+            break ;
+        case kMacBitmapTypeGrafWorld :
+            {
+                if ( data->m_hBitmap )
+                {
+                    wxMacDestroyGWorld( MAC_WXHBITMAP(data->m_hBitmap) ) ;
+                    data->m_hBitmap = NULL ;
+                }
+            }
+            break ;
+        case kMacBitmapTypeIcon :
+            if ( data->m_hIcon )
+            {
+                DisposeCIcon( MAC_WXHICON(data->m_hIcon) ) ;
+                data->m_hIcon = NULL ;
+            }
+        
+        default :
+            // unkown type ?
+            break ;
+    }
+    

   if (data->m_bitmapMask)
   {
     delete data->m_bitmapMask;
   if (data->m_bitmapMask)
   {
     delete data->m_bitmapMask;


@@ -378,29 +428,29 @@ 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 ) ;
-       
-        CGrafPtr       origPort ;
-        GDHandle       origDevice ;
-       
+        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 ) ;
         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

-       
+    

         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 )


@@ -418,8 +468,8 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
                 }
             }
         }
                 }
             }
         }

-        UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
-       
+        UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) ) ) ;
+    

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


@@ -475,7 +525,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 );


@@ -497,10 +547,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));


@@ -524,11 +574,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));
 


@@ -563,7 +613,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;
 }
 


@@ -580,7 +630,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)


@@ -591,7 +641,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);
     }


@@ -642,11 +692,11 @@ 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
     RGBColor colorRGB ;
     
     // Render image
     RGBColor colorRGB ;


@@ -676,8 +726,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++)
       {


@@ -693,12 +743,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 );
 }
 


@@ -717,7 +767,7 @@ 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;
     int      index;
     RGBColor color;
     GDHandle  origDevice;
     int      index;
     RGBColor color;


@@ -727,8 +777,8 @@ wxImage wxBitmap::ConvertToImage() const
     wxMask  *mask = GetMask();
 
     GetGWorld( &origPort, &origDevice );
     wxMask  *mask = GetMask();
 
     GetGWorld( &origPort, &origDevice );

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

 
     // Copy data into image
     index = 0;
 
     // Copy data into image
     index = 0;


@@ -762,7 +812,7 @@ wxImage wxBitmap::ConvertToImage() const
     }
 
     // Free resources
     }
 
     // Free resources

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

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


@@ -900,10 +950,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") );
    


@@ -926,16 +976,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) {


@@ -980,16 +1030,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


@@ -1029,11 +1079,11 @@ wxMask::wxMask(const wxBitmap& bitmap)
 
 wxMask::~wxMask()
 {
 
 wxMask::~wxMask()
 {

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

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


@@ -1041,7 +1091,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,


@@ -1056,13 +1106,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;
 }


@@ -1080,59 +1130,59 @@ 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(  (GWorldPtr) 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(  (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

-       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(  (GWorldPtr) bitmap.GetHBITMAP(), NULL ) ;
+            GetCPixel( w , h , &col ) ;
+            SetGWorld(  (GWorldPtr) m_maskBitmap , NULL ) ;

             if (col.red == maskColor.red && col.green == maskColor.green && col.blue == maskColor.blue)
             {
             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(  (GWorldPtr) bitmap.GetHBITMAP() ) ) ;
+    SetGWorld( origPort , origDevice ) ;

 
     return TRUE;
 }
 
 bool wxMask::PointMasked(int x, int y)
 {
 
     return TRUE;
 }
 
 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;


@@ -1140,11 +1190,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);
 


@@ -1194,35 +1244,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 ;
+    
+    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 ;

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