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

osx new layout

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-02 16:53:23 +00:00
parent 70231bce2d
commit 524c47aa3a
149 changed files with 10286 additions and 9751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -791,8 +791,8 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon)
int w = icon.GetWidth() ;
int h = icon.GetHeight() ;
Create( icon.GetWidth() , icon.GetHeight() ) ;
#ifndef __WXOSX_IPHONE__
Create( w , h ) ;
#ifdef __WXOSX_CARBON__
if ( w == h && ( w == 16 || w == 32 || w == 48 || w == 128 ) )
{
IconFamilyHandle iconFamily = NULL ;
@@ -1021,6 +1021,16 @@ IconRef wxBitmap::CreateIconRef() const
}
#endif
#if wxOSX_USE_COCOA_OR_IPHONE
WX_NSImage wxBitmap::GetNSImage() const
{
wxCFRef< CGImageRef > cgimage(CreateCGImage());
return wxOSXCreateNSImageFromCGImage( cgimage );
}
#endif
wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
{
wxCHECK_MSG( Ok() &&
@@ -1693,7 +1703,7 @@ void wxBitmap::InitStandardHandlers()
#if !defined( __LP64__ ) && !defined(__WXOSX_IPHONE__)
AddHandler( new wxPICTResourceHandler ) ;
#endif
#if wxOSX_USE_COCOA_OR_CARBON
#if wxOSX_USE_CARBON
AddHandler( new wxICONResourceHandler ) ;
#endif
}