X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/846914d18d70a51a43f1ebfe0c850a64708cb772..1be06faf7318abf88a35b299b90ceb2a49c0353b:/src/html/m_image.cpp?ds=sidebyside diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 4c32fbe5e9..09396542cb 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -14,7 +14,7 @@ #include "wx/wxprec.h" #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop @@ -249,7 +249,7 @@ class wxHtmlImageCell : public wxHtmlCell wxHtmlImageMapCell *m_ImageMap; wxString m_MapName; - wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString); + wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString); ~wxHtmlImageCell() {if (m_Image) delete m_Image; } void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; @@ -262,7 +262,7 @@ class wxHtmlImageCell : public wxHtmlCell // wxHtmlImageCell //-------------------------------------------------------------------------------- -wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxString mapname) : wxHtmlCell() +wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, int align, wxString mapname) : wxHtmlCell() { wxImage *img; int ww, hh; @@ -276,6 +276,10 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr hh = img -> GetHeight(); if (w != -1) m_Width = w; else m_Width = ww; if (h != -1) m_Height = h; else m_Height = hh; + + m_Width = (int)(scale * (double)m_Width); + m_Height = (int)(scale * (double)m_Height); + if ((m_Width != ww) || (m_Height != hh)) { wxImage img2 = img -> Scale(m_Width, m_Height); m_Image = new wxBitmap(img2.ConvertToBitmap()); @@ -306,6 +310,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, (m_Image->GetMask() != (wxMask*) 0)); dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE); wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); } @@ -346,47 +351,44 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") TAG_HANDLER_PROC(tag) { - if (tag.GetName() == "IMG") { - if (tag.HasParam("SRC")) { + if (tag.GetName() == wxT("IMG")) { + if (tag.HasParam(wxT("SRC"))) { int w = -1, h = -1; int al; wxFSFile *str; - wxString tmp = tag.GetParam("SRC"); + wxString tmp = tag.GetParam(wxT("SRC")); wxString mn = wxEmptyString; str = m_WParser -> GetFS() -> OpenFile(tmp); if (tag.HasParam(wxT("WIDTH"))) tag.ScanParam(wxT("WIDTH"), wxT("%i"), &w); if (tag.HasParam(wxT("HEIGHT"))) tag.ScanParam(wxT("HEIGHT"), wxT("%i"), &h); al = wxHTML_ALIGN_BOTTOM; - if (tag.HasParam("ALIGN")) { - wxString alstr = tag.GetParam("ALIGN"); + if (tag.HasParam(wxT("ALIGN"))) { + wxString alstr = tag.GetParam(wxT("ALIGN")); alstr.MakeUpper(); // for the case alignment was in ".." - if (alstr == "TEXTTOP") al = wxHTML_ALIGN_TOP; - else if ((alstr == "CENTER") || (alstr == "ABSCENTER")) al = wxHTML_ALIGN_CENTER; + if (alstr == wxT("TEXTTOP")) al = wxHTML_ALIGN_TOP; + else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER"))) al = wxHTML_ALIGN_CENTER; } - if (tag.HasParam("USEMAP")) { - mn = tag.GetParam( "USEMAP" ); - if (mn[ (unsigned int) 0 ] == '#') { + if (tag.HasParam(wxT("USEMAP"))) { + mn = tag.GetParam( wxT("USEMAP") ); + if (mn[ (unsigned int) 0 ] == wxT('#')) { mn = mn.Mid( 1 ); } } wxHtmlImageCell *cel = NULL; if (str) { - cel = new wxHtmlImageCell(str, - (int)(m_WParser -> GetPixelScale() * (double)w), - (int)(m_WParser -> GetPixelScale() * (double)h), - al, mn); + cel = new wxHtmlImageCell(str, w, h, m_WParser -> GetPixelScale(), al, mn); cel -> SetLink(m_WParser -> GetLink()); m_WParser -> GetContainer() -> InsertCell(cel); delete str; } } } - if (tag.GetName() == "MAP") { + if (tag.GetName() == wxT("MAP")) { m_WParser->CloseContainer(); m_WParser->OpenContainer(); - if (tag.HasParam("NAME")) { - wxString tmp = tag.GetParam("NAME"); + if (tag.HasParam(wxT("NAME"))) { + wxString tmp = tag.GetParam(wxT("NAME")); wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp ); m_WParser->GetContainer()->InsertCell( cel ); } @@ -394,26 +396,26 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") m_WParser->CloseContainer(); m_WParser->OpenContainer(); } - if (tag.GetName() == "AREA") { - if (tag.HasParam("SHAPE")) { - wxString tmp = tag.GetParam("SHAPE"); + if (tag.GetName() == wxT("AREA")) { + if (tag.HasParam(wxT("SHAPE"))) { + wxString tmp = tag.GetParam(wxT("SHAPE")); wxString coords = wxEmptyString; tmp.MakeUpper(); wxHtmlImageMapAreaCell *cel = NULL; - if (tag.HasParam("COORDS")) { - coords = tag.GetParam("COORDS"); + if (tag.HasParam(wxT("COORDS"))) { + coords = tag.GetParam(wxT("COORDS")); } - if (tmp == "POLY") { + if (tmp == wxT("POLY")) { cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords, m_WParser -> GetPixelScale() ); - } else if (tmp == "CIRCLE") { + } else if (tmp == wxT("CIRCLE")) { cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords, m_WParser -> GetPixelScale() ); - } else if (tmp == "RECT") { + } else if (tmp == wxT("RECT")) { cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords, m_WParser -> GetPixelScale() ); } - if (cel != NULL && tag.HasParam("HREF")) { - wxString tmp = tag.GetParam("HREF"); + if (cel != NULL && tag.HasParam(wxT("HREF"))) { + wxString tmp = tag.GetParam(wxT("HREF")); wxString target = wxEmptyString; - if (tag.HasParam("TARGET")) target = tag.GetParam("TARGET"); + if (tag.HasParam(wxT("TARGET"))) target = tag.GetParam(wxT("TARGET")); cel->SetLink( wxHtmlLinkInfo(tmp, target)); } if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );