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

Add wxBitmap(NSImage*) ctor to wxOSX.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-02-28 16:28:52 +00:00
parent 4863951a5f
commit 72625b36b6
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/bitmap.h
View File

@@ -105,6 +105,7 @@ public:
// creates an bitmap from the native image format // creates an bitmap from the native image format
wxBitmap(CGImageRef image); wxBitmap(CGImageRef image);
wxBitmap(WX_NSImage image);
// If depth is omitted, will create a bitmap compatible with the display // If depth is omitted, will create a bitmap compatible with the display
wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); } wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
@@ -129,6 +130,7 @@ public:
virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
bool Create( CGImageRef image ); bool Create( CGImageRef image );
bool Create( WX_NSImage image );
// virtual bool Create( WXHICON icon) ; // virtual bool Create( WXHICON icon) ;
virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

11
src/osx/core/bitmap.cpp
View File

@@ -1005,6 +1005,17 @@ IconRef wxBitmap::CreateIconRef() const
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
wxBitmap::wxBitmap(WX_NSImage image)
{
(void)Create(image);
}
bool wxBitmap::Create(WX_NSImage image)
{
wxCFRef<CGImageRef> cgimage(wxOSXCreateCGImageFromNSImage(image));
return Create(cgimage);
}
WX_NSImage wxBitmap::GetNSImage() const WX_NSImage wxBitmap::GetNSImage() const
{ {
wxCFRef< CGImageRef > cgimage(CreateCGImage()); wxCFRef< CGImageRef > cgimage(CreateCGImage());