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
This commit is contained in:
@@ -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);
|
||||
|
Reference in New Issue
Block a user