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

Fixed some bit-rot problems in contribs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-07 22:58:16 +00:00
parent 968602f890
commit 12d1ab44bb
5 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/canvas/canvas.cpp
View File

@@ -1428,7 +1428,7 @@ void wxCanvasImage::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, in
if (cworld->GetRotation())
tmp = tmp.Rotate(-cworld->GetRotation()/180.0 * pi, centr, TRUE, NULL );
bmp = tmp.ConvertToBitmap();
bmp = wxBitmap(tmp);
// create cached bitmap
m_cBitmap = bmp;
@@ -1658,7 +1658,7 @@ void wxCanvasText::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int
wxRect sub_rect( clip_x, clip_y, clip_width, clip_height );
wxBitmap sub_bitmap( bitmap->GetSubBitmap( sub_rect ) );
wxImage image( sub_bitmap );
wxImage image( sub_bitmap.ConvertToImage() );
// local coordinates
int start_x = clip_x - tmparea.x;
@@ -1695,7 +1695,7 @@ void wxCanvasText::Render(wxTransformMatrix* cworld, int clip_x, int clip_y, int
}
}
sub_bitmap = image.ConvertToBitmap();
sub_bitmap = wxBitmap(image);
wxDC *dc = m_admin->GetActive()->GetDC();
dc->DrawBitmap( sub_bitmap, clip_x, clip_y );