#include "wx/mac/uma.h"
+#include "wx/dcmemory.h"
+
// Implementation Notes
// --------------------
//
// we don't dare premultiplied alpha yet
#define wxMAC_USE_PREMULTIPLIED_ALPHA 0
-IconRef wxMacCreateIconRef(const wxBitmap& bmp)
-{
- // setup the header properly
-
- IconFamilyHandle iconFamily = (IconFamilyHandle) NewHandle(8) ;
- (**iconFamily).resourceType = kIconFamilyType ;
- (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
-
- int w = bmp.GetWidth() ;
- int h = bmp.GetHeight() ;
- int sz = wxMax( w , h ) ;
- if ( sz > 128 )
- {
- wxFAIL_MSG( wxT("Currently only 128 pixels wide images are supported") ) ;
- }
-
- Handle data = NULL ;
- Handle maskdata = NULL ;
- unsigned char * maskptr = NULL ;
- unsigned char * ptr = NULL ;
- size_t size ;
- size_t masksize ;
- OSType dataType ;
- OSType maskType ;
-
- bool hasAlpha = bmp.HasAlpha() ;
- wxMask *mask = bmp.GetMask() ;
- // thumbnail is 128 x 128 with 32 bits per pixel
-
- if ( sz > 48 )
- {
- sz = 128 ;
- dataType = kThumbnail32BitData ;
- maskType = kThumbnail8BitMask ;
- }
- else if ( sz > 32 )
- {
- sz = 48 ;
- dataType = kHuge32BitData ;
- maskType = kHuge8BitMask ;
- }
- else if ( sz > 16 )
- {
- sz = 32 ;
- dataType = kLarge32BitData ;
- maskType = kLarge8BitMask ;
- }
- else
- {
- sz = 16 ;
- dataType = kSmall32BitData ;
- maskType = kSmall8BitMask ;
- }
-
- size = sz * sz * 4 ;
- data = NewHandle( size) ;
- HLock( data ) ;
- ptr = (unsigned char*) *data ;
- memset( ptr , 0, size ) ;
-
- masksize = sz * sz ;
- maskdata = NewHandle( masksize ) ;
- HLock( maskdata ) ;
- maskptr = (unsigned char*) *maskdata ;
- memset( maskptr , 0 , masksize ) ;
-
- unsigned char * source = (unsigned char*) bmp.GetRawAccess() ;
- unsigned char * masksource = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
- for ( int y = 0 ; y < h ; ++y )
- {
- unsigned char * dest = ptr + y * sz * 4 ;
- unsigned char * maskdest = maskptr + y * sz ;
- for ( int x = 0 ; x < w ; ++x )
- {
- unsigned char a = *source ++ ;
- unsigned char r = *source ++ ;
- unsigned char g = *source ++ ;
- unsigned char b = *source ++ ;
-
- *dest++ = 0 ;
- *dest++ = r ;
- *dest++ = g ;
- *dest++ = b ;
-
- if ( mask )
- *maskdest++ = *masksource++ ;
- else if ( hasAlpha )
- *maskdest++ = a ;
- else
- *maskdest++ = 0xFF ;
- }
- }
-
- OSStatus err = SetIconFamilyData( iconFamily, dataType , data ) ;
- wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
-
- err = SetIconFamilyData( iconFamily, maskType , maskdata ) ;
- wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ;
- HUnlock( data ) ;
- HUnlock( maskdata ) ;
- DisposeHandle( data ) ;
- DisposeHandle( maskdata ) ;
-
- IconRef iconRef ;
- static int iconCounter = 2 ;
-
- err = RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &iconRef ) ;
- UInt16 owners ;
- err = GetIconRefOwners(iconRef , &owners ) ;
-
- wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
- // we have to retain a reference, as Unregister will decrement it
- AcquireIconRef( iconRef ) ;
- UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;
- DisposeHandle( (Handle) iconFamily ) ;
- ++iconCounter ;
-
- return iconRef ;
-}
+#if wxUSE_BMPBUTTON
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
{
memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
if ( bitmap.Ok() )
{
- wxBitmapRefData * bmap = (wxBitmapRefData*) ( bitmap.GetRefData()) ;
+ wxBitmapRefData * bmap = bitmap.GetBitmapData() ;
if ( bmap == NULL )
return ;
- info->contentType = kControlContentIconRef ;
- info->u.iconRef = wxMacCreateIconRef( bitmap ) ;
-
-#if wxMAC_USE_CORE_GRAPHICS
- /*
- // only on 10.4 more controls will accept a CGImage
-
+
+ if ( ( bmap->HasNativeSize() && forceType == 0 ) || forceType == kControlContentIconRef )
+ {
+ wxBitmap scaleBmp ;
+
+ wxBitmapRefData* bmp = bmap ;
+
+ if ( !bmap->HasNativeSize() )
+ {
+ // as PICT conversion will only result in a 16x16 icon, let's attempt
+ // a few scales for better results
+
+ int w = bitmap.GetWidth() ;
+ int h = bitmap.GetHeight() ;
+ int sz = wxMax( w , h ) ;
+ if ( sz == 24 || sz == 64)
+ {
+ scaleBmp = wxBitmap( bitmap.ConvertToImage().Scale( w * 2 , h * 2 ) ) ;
+ bmp = scaleBmp.GetBitmapData() ;
+ }
+ }
+
+ info->contentType = kControlContentIconRef ;
+ info->u.iconRef = bmp->GetIconRef() ;
+ AcquireIconRef( info->u.iconRef ) ;
+ }
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
+ else if ( forceType == kControlContentCGImageRef )
+ {
info->contentType = kControlContentCGImageRef ;
info->u.imageRef = (CGImageRef) bmap->CGImageCreate() ;
- */
+ }
#endif
+ else
+ {
+ info->contentType = kControlContentPictHandle ;
+ info->u.picture = bmap->GetPictHandle() ;
+ }
}
}
{
if ( info->contentType == kControlContentIconRef )
{
- ReleaseIconRef(info->u.iconRef) ;
+ ReleaseIconRef( info->u.iconRef ) ;
}
-#if wxMAC_USE_CORE_GRAPHICS
+ else if ( info->contentType == kControlContentPictHandle )
+ {
+ // owned by the bitmap, no release here
+ }
+#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
else if ( info->contentType == kControlContentCGImageRef )
{
CGImageRelease( info->u.imageRef ) ;
}
}
+#endif //wxUSE_BMPBUTTON
+
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
void wxBitmapRefData::Init()
{
m_bitmapMask = NULL ;
#if wxMAC_USE_CORE_GRAPHICS
m_cgImageRef = NULL ;
-#else
+#endif
+ m_iconRef = NULL ;
+ m_pictHandle = NULL ;
m_hBitmap = NULL ;
m_hMaskBitmap = NULL;
m_maskBytesPerRow = NULL ;
-#endif
+
m_rawAccessCount = 0 ;
m_hasAlpha = false;
}
void* data = m_memBuf.GetWriteBuf(size) ;
memset( data , 0 , size) ;
m_memBuf.UngetWriteBuf(size) ;
-#if wxMAC_USE_CORE_GRAPHICS
- m_ok = true ;
-#else
+
m_hBitmap = NULL ;
Rect rect = { 0 , 0 , m_height , m_width } ;
verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
(char*) data , m_bytesPerRow ) ) ;
wxASSERT_MSG( m_hBitmap , wxT("Unable to create GWorld context") ) ;
m_ok = ( m_hBitmap != NULL ) ;
-#endif
+
return m_ok ;
}
return ;
m_hasAlpha = use ;
-#if !wxMAC_USE_CORE_GRAPHICS
if ( m_hasAlpha )
{
int width = GetWidth() ;
int height = GetHeight() ;
- m_maskBytesPerRow = ( width + 3 ) & 0xFFFFFFC ;
+ m_maskBytesPerRow = ( width * 4 + 3 ) & 0xFFFFFFC ;
size_t size = height * m_maskBytesPerRow ;
unsigned char * data = (unsigned char * ) m_maskMemBuf.GetWriteBuf( size ) ;
memset( data , 0 , size ) ;
wxASSERT( m_hMaskBitmap == NULL ) ;
Rect rect = { 0 , 0 , height , width } ;
- verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k8IndexedGrayPixelFormat , &rect , NULL , NULL , 0 ,
+ verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_hMaskBitmap , k32ARGBPixelFormat , &rect , NULL , NULL , 0 ,
(char*) data , m_maskBytesPerRow ) ) ;
wxASSERT_MSG( m_hMaskBitmap , wxT("Unable to create GWorld context for alpha mask") ) ;
m_maskMemBuf.UngetWriteBuf(size) ;
+#if !wxMAC_USE_CORE_GRAPHICS
UpdateAlphaMask() ;
+#endif
}
else
{
m_hMaskBitmap = NULL ;
m_maskBytesPerRow = 0 ;
}
-#endif
}
void *wxBitmapRefData::GetRawAccess() const
wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") ) ;
wxASSERT( m_rawAccessCount == 0 ) ;
++m_rawAccessCount ;
-#if wxMAC_USE_CORE_GRAPHICS
- // we must destroy an existing cached image, as
+ // we must destroy an existing cached image, as
// the bitmap data may change now
+ wxASSERT_MSG( m_pictHandle == NULL && m_iconRef == NULL ,
+ wxT("Currently, modifing bitmaps that are used in controls already is not supported") ) ;
+#if wxMAC_USE_CORE_GRAPHICS
if ( m_cgImageRef )
{
CGImageRelease( m_cgImageRef ) ;
#endif
}
+bool wxBitmapRefData::HasNativeSize()
+{
+ int w = GetWidth() ;
+ int h = GetHeight() ;
+ int sz = wxMax( w , h ) ;
+
+ if ( sz == 128 || sz == 48 || sz == 32 || sz == 16 )
+ return true ;
+ return false ;
+}
-#if wxMAC_USE_CORE_GRAPHICS
-static void FreeImageMemoryBufferInstance(void *info, const void *data, size_t size)
+IconRef wxBitmapRefData::GetIconRef()
+{
+ if ( m_iconRef == NULL )
+ {
+ // Create Icon Family Handle
+
+ IconFamilyHandle iconFamily = NULL ;
+
+ iconFamily = (IconFamilyHandle) NewHandle(8) ;
+ (**iconFamily).resourceType = kIconFamilyType ;
+ (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
+
+ int w = GetWidth() ;
+ int h = GetHeight() ;
+ int sz = wxMax( w , h ) ;
+
+ OSType dataType = 0 ;
+ OSType maskType = 0 ;
+
+ if ( sz == 128 )
+ {
+ dataType = kThumbnail32BitData ;
+ maskType = kThumbnail8BitMask ;
+ }
+ else if ( sz == 48 )
+ {
+ dataType = kHuge32BitData ;
+ maskType = kHuge8BitMask ;
+ }
+ else if ( sz == 32 )
+ {
+ dataType = kLarge32BitData ;
+ maskType = kLarge8BitMask ;
+ }
+ else if ( sz == 16 )
+ {
+ dataType = kSmall32BitData ;
+ maskType = kSmall8BitMask ;
+ }
+
+ if ( dataType != 0 )
+ {
+ // setup the header properly
+
+ Handle data = NULL ;
+ Handle maskdata = NULL ;
+ unsigned char * maskptr = NULL ;
+ unsigned char * ptr = NULL ;
+ size_t size ;
+ size_t masksize ;
+
+ size = sz * sz * 4 ;
+ data = NewHandle( size) ;
+ HLock( data ) ;
+ ptr = (unsigned char*) *data ;
+ memset( ptr , 0, size ) ;
+
+ masksize = sz * sz ;
+ maskdata = NewHandle( masksize ) ;
+ HLock( maskdata ) ;
+ maskptr = (unsigned char*) *maskdata ;
+ memset( maskptr , 0 , masksize ) ;
+
+ bool hasAlpha = HasAlpha() ;
+ wxMask *mask = m_bitmapMask ;
+ unsigned char * source = (unsigned char*) GetRawAccess() ;
+ unsigned char * masksource = mask ? (unsigned char*) mask->GetRawAccess() : NULL ;
+ for ( int y = 0 ; y < h ; ++y )
+ {
+ unsigned char * dest = ptr + y * sz * 4 ;
+ unsigned char * maskdest = maskptr + y * sz ;
+ for ( int x = 0 ; x < w ; ++x )
+ {
+ unsigned char a = *source ++ ;
+ unsigned char r = *source ++ ;
+ unsigned char g = *source ++ ;
+ unsigned char b = *source ++ ;
+
+ *dest++ = 0 ;
+ *dest++ = r ;
+ *dest++ = g ;
+ *dest++ = b ;
+
+ if ( mask )
+ *maskdest++ = *masksource++ ;
+ else if ( hasAlpha )
+ *maskdest++ = a ;
+ else
+ *maskdest++ = 0xFF ;
+ }
+ }
+
+ OSStatus err = SetIconFamilyData( iconFamily, dataType , data ) ;
+ wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
+
+ err = SetIconFamilyData( iconFamily, maskType , maskdata ) ;
+ wxASSERT_MSG( err == noErr , wxT("Error when adding mask") ) ;
+ HUnlock( data ) ;
+ HUnlock( maskdata ) ;
+ DisposeHandle( data ) ;
+ DisposeHandle( maskdata ) ;
+ }
+ else
+ {
+ iconFamily = (IconFamilyHandle) NewHandle(8) ;
+ (**iconFamily).resourceType = kIconFamilyType ;
+ (**iconFamily).resourceSize = sizeof(OSType) + sizeof(Size);
+ PicHandle pic = GetPictHandle() ;
+ SetIconFamilyData( iconFamily, 'PICT' , (Handle) pic ) ;
+ }
+
+ // transform into IconRef
+
+ static int iconCounter = 2 ;
+#ifdef __WXDEBUG__
+ OSStatus err =
+#endif
+ RegisterIconRefFromIconFamily( 'WXNG' , (OSType) iconCounter, iconFamily, &m_iconRef ) ;
+ wxASSERT_MSG( err == noErr , wxT("Error when adding bitmap") ) ;
+ // we have to retain a reference, as Unregister will decrement it
+ AcquireIconRef( m_iconRef ) ;
+ UnregisterIconRef( 'WXNG' , (OSType) iconCounter ) ;
+ DisposeHandle( (Handle) iconFamily ) ;
+ ++iconCounter ;
+ }
+ return m_iconRef ;
+}
+
+PicHandle wxBitmapRefData::GetPictHandle()
+{
+ if ( m_pictHandle == NULL )
+ {
+ CGrafPtr origPort = NULL ;
+ GDHandle origDev = NULL ;
+ GWorldPtr wp = NULL ;
+ GWorldPtr mask = NULL ;
+ int height = GetHeight() ;
+ int width = GetWidth() ;
+
+ Rect rect = { 0 , 0 , height , width } ;
+
+ GetGWorld( &origPort , &origDev ) ;
+
+ wp = GetHBITMAP( &mask ) ;
+
+ RgnHandle clipRgn = NULL ;
+
+ if ( mask )
+ {
+ GWorldPtr monoworld ;
+ clipRgn = NewRgn() ;
+ OSStatus err = NewGWorld( &monoworld , 1 , &rect , NULL , NULL , 0 ) ;
+ verify_noerr(err) ;
+ LockPixels( GetGWorldPixMap( monoworld ) ) ;
+ LockPixels( GetGWorldPixMap( mask ) ) ;
+ SetGWorld( monoworld , NULL ) ;
+ RGBColor white = { 0xffff ,0xffff , 0xffff } ;
+ RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ;
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+ CopyBits(GetPortBitMapForCopyBits(mask),
+ GetPortBitMapForCopyBits(monoworld),
+ &rect,
+ &rect,
+ srcCopy,NULL);
+ BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( monoworld ) ) ;
+ UnlockPixels( GetGWorldPixMap( monoworld ) ) ;
+ UnlockPixels( GetGWorldPixMap( mask ) ) ;
+ DisposeGWorld( monoworld ) ;
+ }
+
+ SetGWorld( wp , NULL ) ;
+ Rect portRect ;
+ GetPortBounds( wp , &portRect ) ;
+ m_pictHandle = OpenPicture(&portRect);
+
+ if(m_pictHandle)
+ {
+ RGBColor white = { 0xffff ,0xffff , 0xffff } ;
+ RGBColor black = { 0x0000 ,0x0000 , 0x0000 } ;
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+
+ if ( clipRgn )
+ SetClip( clipRgn ) ;
+
+ LockPixels( GetGWorldPixMap( wp ) ) ;
+ CopyBits(GetPortBitMapForCopyBits(wp),
+ GetPortBitMapForCopyBits(wp),
+ &portRect,
+ &portRect,
+ srcCopy,clipRgn);
+ UnlockPixels( GetGWorldPixMap( wp ) ) ;
+ ClosePicture();
+ }
+ SetGWorld( origPort , origDev ) ;
+ if ( clipRgn )
+ DisposeRgn( clipRgn ) ;
+ }
+ return m_pictHandle ;
+}
+
+#ifdef __WXMAC_OSX__
+void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size)
{
- delete ((wxMemoryBuffer*)info) ;
+ wxMemoryBuffer* membuf = (wxMemoryBuffer*) info ;
+ wxASSERT( data == membuf->GetData() ) ;
+ delete membuf ;
}
CGImageRef wxBitmapRefData::CGImageCreate() const
}
CGColorSpaceRef colorSpace = wxMacGetGenericRGBColorSpace();
CGDataProviderRef dataProvider =
- CGDataProviderCreateWithData( membuf , (const void *)membuf->GetData() , imageSize, FreeImageMemoryBufferInstance );
+ CGDataProviderCreateWithData( membuf , (const void *)membuf->GetData() , imageSize,
+ wxMacMemoryBufferReleaseProc );
image =
::CGImageCreate( w, h, 8 , 32 , 4 * m_width , colorSpace, alphaInfo ,
dataProvider, NULL , false , kCGRenderingIntentDefault );
}
#endif
-#if !wxMAC_USE_CORE_GRAPHICS
GWorldPtr wxBitmapRefData::GetHBITMAP(GWorldPtr* mask) const
{
wxCHECK_MSG( Ok(), NULL, wxT("invalid bitmap") );
*mask = (GWorldPtr) m_bitmapMask->GetHBITMAP() ;
else if ( m_hasAlpha )
{
+#if !wxMAC_USE_CORE_GRAPHICS
if ( m_rawAccessCount > 0 )
UpdateAlphaMask() ;
+#else
+ // this structure is not kept in synch when using CG, so if someone
+ // is really accessing the Graphports, we have to sync it
+ UpdateAlphaMask() ;
+#endif
*mask = m_hMaskBitmap ;
}
}
for ( int y = 0 ; y < h ; ++y , destalphabase += m_maskBytesPerRow )
{
unsigned char* destalpha = destalphabase ;
- for( int x = 0 ; x < w ; ++x , sourcemask += 4, ++destalpha )
+ for( int x = 0 ; x < w ; ++x , sourcemask += 4 )
{
- *destalpha = *sourcemask ;
+ // we must have 24 bit depth for non quartz smooth alpha
+ *destalpha++ = 255 ;
+ *destalpha++ = 255 - *sourcemask ;
+ *destalpha++ = 255 - *sourcemask ;
+ *destalpha++ = 255 - *sourcemask ;
}
}
}
}
-#endif
-
void wxBitmapRefData::Free()
{
wxASSERT_MSG( m_rawAccessCount == 0 , wxT("Bitmap still selected when destroyed") ) ;
CGImageRelease( m_cgImageRef ) ;
m_cgImageRef = NULL ;
}
-#else
+#endif
+ if ( m_iconRef )
+ {
+ ReleaseIconRef( m_iconRef ) ;
+ m_iconRef = NULL ;
+ }
+ if ( m_pictHandle )
+ {
+ KillPicture( m_pictHandle ) ;
+ m_pictHandle = NULL ;
+ }
if ( m_hBitmap )
{
DisposeGWorld( MAC_WXHBITMAP(m_hBitmap) ) ;
DisposeGWorld( MAC_WXHBITMAP(m_hMaskBitmap) ) ;
m_hMaskBitmap = NULL ;
}
-#endif
if (m_bitmapMask)
{
{
int w = icon.GetWidth() ;
int h = icon.GetHeight() ;
+
+
Create( icon.GetWidth() , icon.GetHeight() ) ;
- if ( w == h && w == 32 )
+ bool created = false ;
+
+ if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) )
{
IconFamilyHandle iconFamily = NULL ;
Handle imagehandle = NewHandle(0) ;
Handle maskhandle = NewHandle(0) ;
- OSStatus err = ( IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , kSelectorLarge32Bit | kSelectorLarge8BitMask , &iconFamily ) ) ;
- err =( GetIconFamilyData( iconFamily , kLarge32BitData , imagehandle ) ) ;
- err =( GetIconFamilyData( iconFamily , kLarge8BitMask , maskhandle ) ) ;
- wxASSERT( GetHandleSize( imagehandle ) == w * 4 * h ) ;
- wxASSERT( GetHandleSize( maskhandle ) == w * h ) ;
- UseAlpha() ;
- unsigned char *source = (unsigned char *) *imagehandle ;
- unsigned char *sourcemask = (unsigned char *) *maskhandle ;
- unsigned char* destination = (unsigned char*) BeginRawAccess() ;
- for ( int y = 0 ; y < h ; ++y )
+ OSType maskType = 0;
+ OSType dataType = 0;
+ IconSelectorValue selector = 0 ;
+ if ( w == 128 )
+ {
+ dataType = kThumbnail32BitData ;
+ maskType = kThumbnail8BitMask ;
+ selector = kSelectorAllAvailableData ;
+ }
+ else if ( w == 48 )
{
- for ( int x = 0 ; x < w ; ++x )
+ dataType = kHuge32BitData ;
+ maskType = kHuge8BitMask ;
+ selector = kSelectorHuge32Bit | kSelectorHuge8BitMask ;
+ }
+ else if ( w == 32 )
+ {
+ dataType = kLarge32BitData ;
+ maskType = kLarge8BitMask ;
+ selector = kSelectorLarge32Bit | kSelectorLarge8BitMask ;
+ }
+ else if ( w == 16 )
+ {
+ dataType = kSmall32BitData ;
+ maskType = kSmall8BitMask ;
+ selector = kSelectorSmall32Bit | kSelectorSmall8BitMask ;
+ }
+
+
+ OSStatus err = ( IconRefToIconFamily( MAC_WXHICON(icon.GetHICON()) , selector , &iconFamily ) ) ;
+
+ err =( GetIconFamilyData( iconFamily , dataType , imagehandle ) ) ;
+ err =( GetIconFamilyData( iconFamily , maskType , maskhandle ) ) ;
+ size_t imagehandlesize = GetHandleSize( imagehandle ) ;
+ size_t maskhandlesize = GetHandleSize( maskhandle ) ;
+
+ if ( imagehandlesize != 0 && maskhandlesize != 0 )
+ {
+ wxASSERT( GetHandleSize( imagehandle ) == w * 4 * h ) ;
+ wxASSERT( GetHandleSize( maskhandle ) == w * h ) ;
+ UseAlpha() ;
+ unsigned char *source = (unsigned char *) *imagehandle ;
+ unsigned char *sourcemask = (unsigned char *) *maskhandle ;
+
+ unsigned char* destination = (unsigned char*) BeginRawAccess() ;
+ for ( int y = 0 ; y < h ; ++y )
{
- *destination++ = *sourcemask++ ;
- source++ ;
- *destination++ = *source++ ;
- *destination++ = *source++ ;
- *destination++ = *source++ ;
+ for ( int x = 0 ; x < w ; ++x )
+ {
+ *destination++ = *sourcemask++ ;
+ source++ ;
+ *destination++ = *source++ ;
+ *destination++ = *source++ ;
+ *destination++ = *source++ ;
+ }
}
+ EndRawAccess() ;
+ DisposeHandle( imagehandle ) ;
+ DisposeHandle( maskhandle ) ;
}
- EndRawAccess() ;
- DisposeHandle( imagehandle ) ;
- DisposeHandle( maskhandle ) ;
+ DisposeHandle( (Handle) iconFamily ) ;
+
}
- else
+
+ if ( !created )
{
wxMemoryDC dc ;
dc.SelectObject( *this ) ;
bool wxBitmap::CreateFromXpm(const char **bits)
{
+#if wxUSE_IMAGE
wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
wxXPMDecoder decoder;
wxImage img = decoder.ReadData(bits);
wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )
*this = wxBitmap(img);
return TRUE;
+#else
+ return FALSE;
+#endif
}
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
WXCGIMAGEREF wxBitmap::CGImageCreate() const
{
wxCHECK_MSG( Ok(), NULL , wxT("invalid bitmap") ) ;
}
else
{
+#if wxUSE_IMAGE
wxImage loadimage(filename, type);
if (loadimage.Ok()) {
*this = loadimage;
return true;
}
+#endif
}
wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
return false;
return handler->Create(this, data, type, width, height, depth);
}
+#if wxUSE_IMAGE
+
wxBitmap::wxBitmap(const wxImage& image, int depth)
{
wxCHECK_RET( image.Ok(), wxT("invalid image") )
bool hasAlpha = false ;
bool hasMask = false ;
+ int maskBytesPerRow = 0 ;
unsigned char *alpha = NULL ;
unsigned char *mask = NULL ;
if ( HasAlpha() )
{
hasMask = true ;
mask = (unsigned char*) GetMask()->GetRawAccess() ;
+ maskBytesPerRow = GetMask()->GetBytesPerRow() ;
}
if ( hasAlpha )
static const int MASK_BLUE = 3;
static const int MASK_BLUE_REPLACEMENT = 2;
- for (int yy = 0; yy < height; yy++)
+ for (int yy = 0; yy < height; yy++ , mask += maskBytesPerRow )
{
+ unsigned char * maskp = mask ;
for (int xx = 0; xx < width; xx++)
{
long color = *((long*) source) ;
unsigned char b = (color&0x000000FF);
if ( hasMask )
{
- if ( *mask++ == 0 )
+ if ( *maskp++ == 0 )
{
if ( r == MASK_RED && g == MASK_GREEN && b == MASK_BLUE )
b = MASK_BLUE_REPLACEMENT ;
- }
- else
- {
- r = MASK_RED ;
- g = MASK_GREEN ;
- b = MASK_BLUE ;
+ else
+ {
+ r = MASK_RED ;
+ g = MASK_GREEN ;
+ b = MASK_BLUE ;
+ }
}
}
else if ( hasAlpha )
return image;
}
+#endif //wxUSE_IMAGE
bool wxBitmap::SaveFile(const wxString& filename, wxBitmapType type,
const wxPalette *palette) const
}
else
{
+#if wxUSE_IMAGE
wxImage image = ConvertToImage();
-
return image.SaveFile(filename, type);
+#endif
}
wxLogWarning(wxT("no bitmap handler for type %d defined."), type);
return M_BITMAPDATA->GetDepth();
}
+#if WXWIN_COMPATIBILITY_2_4
+
int wxBitmap::GetQuality() const
{
return 0;
}
+#endif
+
wxMask *wxBitmap::GetMask() const
{
wxCHECK_MSG( Ok(), (wxMask *) NULL, wxT("invalid bitmap") );
M_BITMAPDATA->SetDepth(d);
}
+#if WXWIN_COMPATIBILITY_2_4
+
void wxBitmap::SetQuality(int WXUNUSED(quality))
{
}
+#endif
+
void wxBitmap::SetOk(bool isOk)
{
if (!M_BITMAPDATA)
M_BITMAPDATA->m_bitmapMask = mask ;
}
-#if !wxMAC_USE_CORE_GRAPHICS
WXHBITMAP wxBitmap::GetHBITMAP(WXHBITMAP* mask) const
{
return WXHBITMAP(M_BITMAPDATA->GetHBITMAP((GWorldPtr*)mask));
}
-#endif
// ----------------------------------------------------------------------------
// wxMask
wxMask::~wxMask()
{
-#if !wxMAC_USE_CORE_GRAPHICS
if ( m_maskBitmap )
{
DisposeGWorld( (GWorldPtr) m_maskBitmap ) ;
m_maskBitmap = NULL ;
}
-#endif
}
void wxMask::Init()
{
m_width = m_height = m_bytesPerRow = 0 ;
-#if !wxMAC_USE_CORE_GRAPHICS
m_maskBitmap = NULL ;
-#endif
-
}
void *wxMask::GetRawAccess() const
return m_memBuf.GetData() ;
}
+// this can be a k8IndexedGrayPixelFormat GWorld, because it never stores other values than black or white
+// so no rainbox colors will be created by QD when blitting
+
void wxMask::RealizeNative()
{
-#if !wxMAC_USE_CORE_GRAPHICS
if ( m_maskBitmap )
{
DisposeGWorld( (GWorldPtr) m_maskBitmap ) ;
Rect rect = { 0 , 0 , m_height , m_width } ;
verify_noerr( NewGWorldFromPtr( (GWorldPtr*) &m_maskBitmap , k8IndexedGrayPixelFormat , &rect , NULL , NULL , 0 ,
(char*) m_memBuf.GetData() , m_bytesPerRow ) ) ;
-#endif
}
// Create a mask from a mono bitmap (copies the bitmap).
return TRUE;
}
-#if !wxMAC_USE_CORE_GRAPHICS
WXHBITMAP wxMask::GetHBITMAP() const
{
return m_maskBitmap ;
}
-#endif
// ----------------------------------------------------------------------------
// wxBitmapHandler
};
IMPLEMENT_DYNAMIC_CLASS(wxPICTResourceHandler, wxBitmapHandler)
+
bool wxPICTResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
int desiredWidth, int desiredHeight)
{
+#if wxUSE_METAFILE
Str255 theName ;
wxMacStringToPascal( name , theName ) ;
dc.SelectObject( wxNullBitmap ) ;
return TRUE ;
}
+#endif //wxUSE_METAFILE
return FALSE ;
}
+
void wxBitmap::InitStandardHandlers()
{
AddHandler(new wxPICTResourceHandler) ;
projects / wxWidgets.git / blobdiff