DrawIcon correction for WIN16
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -844,8 +844,11 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
|
|||||||
{
|
{
|
||||||
wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
|
wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
|
||||||
|
|
||||||
//::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
|
#ifdef __WIN32__
|
||||||
::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
|
::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
|
||||||
|
#else
|
||||||
|
::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
|
||||||
|
#endif
|
||||||
|
|
||||||
CalcBoundingBox(x, y);
|
CalcBoundingBox(x, y);
|
||||||
CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
|
CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
|
||||||
|
Reference in New Issue
Block a user