Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp

or get assert in DoBlit


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-01-24 12:24:57 +00:00
parent 0f42a87192
commit 6b82d89473
2 changed files with 16 additions and 7 deletions

View File

@@ -306,7 +306,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr
void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
if (m_Image)
dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE);
dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}