Use new bitmap scalingin DrawBitmap() as well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@24141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1060,20 +1060,9 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
|
||||
}
|
||||
|
||||
// scale bitmap if required
|
||||
wxBitmap use_bitmap;
|
||||
wxBitmap use_bitmap = bitmap;
|
||||
if ((w != ww) || (h != hh))
|
||||
{
|
||||
wxImage image = bitmap.ConvertToImage();
|
||||
image.Rescale( ww, hh );
|
||||
if (is_mono)
|
||||
use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
|
||||
else
|
||||
use_bitmap = wxBitmap(image);
|
||||
}
|
||||
else
|
||||
{
|
||||
use_bitmap = bitmap;
|
||||
}
|
||||
use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
|
||||
|
||||
// apply mask if any
|
||||
GdkBitmap *mask = (GdkBitmap *) NULL;
|
||||
|
@@ -1060,20 +1060,9 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
|
||||
}
|
||||
|
||||
// scale bitmap if required
|
||||
wxBitmap use_bitmap;
|
||||
wxBitmap use_bitmap = bitmap;
|
||||
if ((w != ww) || (h != hh))
|
||||
{
|
||||
wxImage image = bitmap.ConvertToImage();
|
||||
image.Rescale( ww, hh );
|
||||
if (is_mono)
|
||||
use_bitmap = wxBitmap(image.ConvertToMono(255,255,255), 1);
|
||||
else
|
||||
use_bitmap = wxBitmap(image);
|
||||
}
|
||||
else
|
||||
{
|
||||
use_bitmap = bitmap;
|
||||
}
|
||||
use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, hh );
|
||||
|
||||
// apply mask if any
|
||||
GdkBitmap *mask = (GdkBitmap *) NULL;
|
||||
|
Reference in New Issue
Block a user