From 556bf2c3687f2304eb7d75edaa28e026a316e9cf Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 31 Jan 2006 16:22:54 +0000 Subject: [PATCH] Mac doesn't like getting an icon if it's a bitmap git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/toolbkg.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/generic/toolbkg.cpp b/src/generic/toolbkg.cpp index f40261c4e3..af7d3f2c9e 100644 --- a/src/generic/toolbkg.cpp +++ b/src/generic/toolbkg.cpp @@ -319,10 +319,16 @@ wxToolbook::InsertPage(size_t n, if (!GetImageList()) return false; + // TODO: make sure all platforms can convert between icon and bitmap, + // and/or test whether the image is a bitmap or an icon. +#ifdef __WXMAC__ + wxBitmap bitmap = GetImageList()->GetBitmap(imageId); +#else // On Windows, we can lose information by using GetBitmap, so extract icon instead wxIcon icon = GetImageList()->GetIcon(imageId); wxBitmap bitmap; bitmap.CopyFromIcon(icon); +#endif m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x); m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y); -- 2.45.2