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

Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

Browse Source 
with or without the bitmap mask applied.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-12-15 19:30:54 +00:00
parent 7b70a3257f
commit 9c54e4ae1f
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/cocoa/bitmap.h
View File

@@ -148,6 +148,7 @@ public:
// wxCocoa // wxCocoa
WX_NSBitmapImageRep GetNSBitmapImageRep(); WX_NSBitmapImageRep GetNSBitmapImageRep();
void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep); void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep);
WX_NSImage GetNSImage(bool useMask) const;
static void InitStandardHandlers() { } static void InitStandardHandlers() { }
static void CleanUpHandlers() { } static void CleanUpHandlers() { }

22
src/cocoa/bitmap.mm
View File

@@ -27,6 +27,7 @@
#import <AppKit/NSBitmapImageRep.h> #import <AppKit/NSBitmapImageRep.h>
#import <AppKit/NSGraphics.h> #import <AppKit/NSGraphics.h>
#import <AppKit/NSImage.h>
// ======================================================================== // ========================================================================
// wxBitmapRefData // wxBitmapRefData
@@ -145,6 +146,27 @@ WX_NSBitmapImageRep wxBitmap::GetNSBitmapImageRep()
return M_BITMAPDATA->m_cocoaNSBitmapImageRep; return M_BITMAPDATA->m_cocoaNSBitmapImageRep;
} }
WX_NSImage wxBitmap::GetNSImage(bool useMask) const
{
if(!Ok())
return nil;
NSImage *nsimage = [[[NSImage alloc]
initWithSize:NSMakeSize(GetWidth(), GetHeight())] autorelease];
if(!nsimage)
return nil;
[nsimage addRepresentation: M_BITMAPDATA->m_cocoaNSBitmapImageRep];
if(useMask && GetMask())
{
NSImage *maskImage = [[NSImage alloc]
initWithSize:NSMakeSize(GetWidth(), GetHeight())];
[maskImage addRepresentation: GetMask()->GetNSBitmapImageRep()];
[nsimage lockFocus];
[maskImage compositeToPoint:NSZeroPoint operation:NSCompositeDestinationIn];
[nsimage unlockFocus];
}
return nsimage;
}
void wxBitmap::SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep) void wxBitmap::SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep)
{ {
if(!M_BITMAPDATA) if(!M_BITMAPDATA)