Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/mac/carbon/bitmap.cpp
View File

@@ -272,14 +272,19 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
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 ) ;
if ( clipRgn )
SetClip( clipRgn ) ;
LockPixels( GetGWorldPixMap( wp ) ) ;
CopyBits(GetPortBitMapForCopyBits(wp),
GetPortBitMapForCopyBits(wp),
@@ -290,10 +295,12 @@ PicHandle wxMacCreatePict(GWorldPtr wp, GWorldPtr mask)
ClosePicture();
}
SetGWorld( origPort , origDev ) ;
if ( clipRgn )
DisposeRgn( clipRgn ) ;
return pict;
}
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , bool forceColorIcon )
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType )
{
memset( info , 0 , sizeof(ControlButtonContentInfo) ) ;
if ( bitmap.Ok() )
@@ -309,7 +316,7 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
}
else if ( bmap->m_bitmapType == kMacBitmapTypeGrafWorld )
{
if ( (forceColorIcon || bmap->m_width == bmap->m_height) && ((bmap->m_width & 0x3) == 0) )
if ( (forceType == kControlContentCIconHandle || ( bmap->m_width == bmap->m_height && forceType != kControlContentPictHandle ) ) && ((bmap->m_width & 0x3) == 0) )
{
info->contentType = kControlContentCIconHandle ;
if ( bitmap.GetMask() )
@@ -771,6 +778,8 @@ wxImage wxBitmap::ConvertToImage() const
GWorldPtr origPort;
GDHandle origDevice;
RgnHandle maskRgn = NULL ;
GWorldPtr tempPort = NULL ;
int index;
RGBColor color;
// background color set to RGB(16,16,16) in consistent with wxGTK
@@ -779,9 +788,28 @@ wxImage wxBitmap::ConvertToImage() const
wxMask *mask = GetMask();
GetGWorld( &origPort, &origDevice );
LockPixels(GetGWorldPixMap( (GWorldPtr) GetHBITMAP()));
SetGWorld( (GWorldPtr) 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++)
@@ -795,27 +823,50 @@ wxImage wxBitmap::ConvertToImage() const
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;
}
}
}
else
{
if (mask)
{
if (mask->PointMasked(xx,yy))
{
data[index ] = mask_r;
data[index + 1] = mask_g;
data[index + 2] = mask_b;
}
}
}
index += 3;
}
}
if (mask)
if (mask || maskRgn )
{
image.SetMaskColour( mask_r, mask_g, mask_b );
image.SetMask( true );
}
// Free resources
UnlockPixels(GetGWorldPixMap( (GWorldPtr) GetHBITMAP()));
UnlockPixels(GetGWorldPixMap( tempPort ));
SetGWorld(origPort, origDevice);
if ( GetBitmapType() != kMacBitmapTypeGrafWorld )
{
wxMacDestroyGWorld( tempPort ) ;
}
if ( maskRgn )
{
DisposeRgn( maskRgn ) ;
}
return image;
}