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

Use new bitmap scalingin DrawBitmap() as well.

Browse Source 
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:
Robert Roebling
2003-10-09 19:50:00 +00:00
parent 0ac860470c
commit dcf18859bb
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/dcclient.cpp
View File

@@ -1060,20 +1060,9 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
} }
// scale bitmap if required // scale bitmap if required
wxBitmap use_bitmap; wxBitmap use_bitmap = bitmap;
if ((w != ww) || (h != hh)) if ((w != ww) || (h != hh))
{ use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, 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;
}
// apply mask if any // apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;

15
src/gtk1/dcclient.cpp
View File

@@ -1060,20 +1060,9 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
} }
// scale bitmap if required // scale bitmap if required
wxBitmap use_bitmap; wxBitmap use_bitmap = bitmap;
if ((w != ww) || (h != hh)) if ((w != ww) || (h != hh))
{ use_bitmap = use_bitmap.Rescale( 0, 0, ww, hh, ww, 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;
}
// apply mask if any // apply mask if any
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;