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

Fixed handling of transparent background in borderless wxBitmapButton (patch #1477883)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-04-24 23:20:08 +00:00
parent 4f3d5bc061
commit 6d55ca7cb1
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/bmpbuttn.cpp
View File

@@ -14,6 +14,7 @@
#if wxUSE_BMPBUTTON #if wxUSE_BMPBUTTON
#include "wx/bmpbuttn.h" #include "wx/bmpbuttn.h"
#include "wx/image.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dcmemory.h" #include "wx/dcmemory.h"
@@ -63,14 +64,12 @@ static wxBitmap wxMakeStdSizeBitmap(const wxBitmap& bitmap)
wxASSERT_MSG( width <= sizeStd && height <= sizeStd, wxASSERT_MSG( width <= sizeStd && height <= sizeStd,
_T("bitmap shouldn't be cropped") ); _T("bitmap shouldn't be cropped") );
newBmp.Create(sizeStd, sizeStd); wxImage square_image = bitmap.ConvertToImage();
wxMemoryDC dcMem; newBmp = square_image.Size
dcMem.SelectObject(newBmp); (
dcMem.Clear(); wxSize(sizeStd, sizeStd),
wxPoint((sizeStd - width)/2, (sizeStd-height)/2)
dcMem.DrawBitmap(bitmap, );
(sizeStd - width)/2, (sizeStd-height)/2,
true);
} }
} }
//else: let the system rescale the bitmap //else: let the system rescale the bitmap