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

iPhone bitmap support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-07-10 17:33:43 +00:00
parent 7af25c3a80
commit 4bea628d00
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,9 +166,13 @@ public:
// returns a CGImageRef which must released after usage with CGImageRelease // returns a CGImageRef which must released after usage with CGImageRelease
CGImageRef CreateCGImage() const ; CGImageRef CreateCGImage() const ;
#if wxOSX_USE_COCOA_OR_IPHONE #if wxOSX_USE_COCOA
// returns an autoreleased version of the image // returns an autoreleased version of the image
WX_NSImage GetNSImage() const; WX_NSImage GetNSImage() const;
#endif
#if wxOSX_USE_IPHONE
// returns an autoreleased version of the image
WX_UIImage GetUIImage() const;
#endif #endif
// returns a IconRef which must be retained before and released after usage // returns a IconRef which must be retained before and released after usage
IconRef GetIconRef() const; IconRef GetIconRef() const;

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

@@ -1019,7 +1019,7 @@ IconRef wxBitmap::CreateIconRef() const
} }
#endif #endif
#if wxOSX_USE_COCOA_OR_IPHONE #if wxOSX_USE_COCOA
WX_NSImage wxBitmap::GetNSImage() const WX_NSImage wxBitmap::GetNSImage() const
{ {
@@ -1029,6 +1029,15 @@ WX_NSImage wxBitmap::GetNSImage() const
#endif #endif
#if wxOSX_USE_IPHONE
WX_UIImage wxBitmap::GetUIImage() const
{
wxCFRef< CGImageRef > cgimage(CreateCGImage());
return wxOSXCreateUIImageFromCGImage( cgimage );
}
#endif
wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
{ {
wxCHECK_MSG( Ok() && wxCHECK_MSG( Ok() &&