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

merging r60166

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_9_0_BRANCH@60168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-04-15 17:49:34 +00:00
parent 6dc784b36e
commit 0f052f574f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osx/carbon/icon.cpp
View File

@@ -334,7 +334,7 @@ bool wxIcon::LoadFile(
#endif #endif
} }
} }
return true ; return false;
} }
void wxIcon::CopyFromBitmap( const wxBitmap& bmp ) void wxIcon::CopyFromBitmap( const wxBitmap& bmp )
@@ -353,9 +353,11 @@ bool wxICONResourceHandler::LoadFile(
int desiredWidth, int desiredHeight ) int desiredWidth, int desiredHeight )
{ {
wxIcon icon ; wxIcon icon ;
icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) ; if ( icon.LoadFile( name , wxBITMAP_TYPE_ICON_RESOURCE , desiredWidth , desiredHeight ) )
bitmap->CopyFromIcon( icon ) ; {
bitmap->CopyFromIcon( icon ) ;
return bitmap->Ok() ; return bitmap->Ok() ;
}
return false;
} }