From 3222fc18c9363f4339937bac1f92705ee6cfcd7c Mon Sep 17 00:00:00 2001 From: David Elliott Date: Thu, 29 Nov 2007 07:24:19 +0000 Subject: [PATCH] Implement wxIcon::LoadFile by defering to wxBitmap implementation instead of creating a dummy 5x5 image. Patch authored by Software 2000 Ltd. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/icon.mm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/cocoa/icon.mm b/src/cocoa/icon.mm index 09924c8cb7..91b059ba59 100644 --- a/src/cocoa/icon.mm +++ b/src/cocoa/icon.mm @@ -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) -- 2.45.2