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

Implement wxIcon::LoadFile by defering to wxBitmap implementation instead of creating a dummy 5x5 image.

Browse Source 
Patch authored by Software 2000 Ltd.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@50318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-11-29 07:24:19 +00:00
parent bbe295ba4d
commit 7acb34f44c
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cocoa/icon.mm
View File

@@ -108,17 +108,9 @@ bool wxIcon::CreateFromXpm(const char **xpm)
bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
int desiredWidth, int desiredHeight)
{
UnRef();
m_refData = new wxIconRefData;
M_ICONDATA->m_width = 5;
M_ICONDATA->m_height = 5;
M_ICONDATA->m_cocoaNSImage = [[NSImage alloc] initWithSize:NSMakeSize(5,5)];
M_ICONDATA->m_ok = true;
M_ICONDATA->m_numColors = 0;
M_ICONDATA->m_quality = 0;
return false;
wxBitmap bitmap(filename, type);
CopyFromBitmap(bitmap);
return bitmap.Ok();
}
void wxIcon::CopyFromBitmap(const wxBitmap& bitmap)