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

Mac doesn't like getting an icon if it's a bitmap

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-31 16:22:54 +00:00
parent bd1a4a99fc
commit 556bf2c368
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generic/toolbkg.cpp
View File

@@ -319,10 +319,16 @@ wxToolbook::InsertPage(size_t n,
if (!GetImageList()) if (!GetImageList())
return false; 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 // On Windows, we can lose information by using GetBitmap, so extract icon instead
wxIcon icon = GetImageList()->GetIcon(imageId); wxIcon icon = GetImageList()->GetIcon(imageId);
wxBitmap bitmap; wxBitmap bitmap;
bitmap.CopyFromIcon(icon); bitmap.CopyFromIcon(icon);
#endif
m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x); m_maxBitmapSize.x = wxMax(bitmap.GetWidth(), m_maxBitmapSize.x);
m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y); m_maxBitmapSize.y = wxMax(bitmap.GetHeight(), m_maxBitmapSize.y);