X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f124ddf4502341eb60d41d27da7f24f4ae9fd25c:/src/html/m_image.cpp?ds=sidebyside diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index aaf6a8fa4a..c9660bd477 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -35,6 +35,7 @@ #include "wx/gifdecod.h" #include "wx/dynarray.h" #include "wx/log.h" +#include "wx/artprov.h" #include <math.h> #include <float.h> @@ -49,11 +50,11 @@ WX_DECLARE_OBJARRAY(int, CoordArray); WX_DEFINE_OBJARRAY(CoordArray); -//-------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- // wxHtmlImageMapAreaCell -// 0-width, 0-height cell that represents single area in imagemap -// (it's GetLink is called from wxHtmlImageCell's) -//-------------------------------------------------------------------------------- +// 0-width, 0-height cell that represents single area in +// imagemap (it's GetLink is called from wxHtmlImageCell's) +// --------------------------------------------------------------------------- class wxHtmlImageMapAreaCell : public wxHtmlCell { @@ -66,6 +67,10 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell public: wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0); virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; + void Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingState& WXUNUSED(state)) {} }; @@ -238,6 +243,10 @@ class wxHtmlImageMapCell : public wxHtmlCell public: virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; virtual const wxHtmlCell *Find( int cond, const void *param ) const; + void Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingState& WXUNUSED(state)) {} }; @@ -281,7 +290,8 @@ public: double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, const wxString& mapname = wxEmptyString); ~wxHtmlImageCell(); - void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); + void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, + wxHtmlRenderingState& state); virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const; void SetImage(const wxImage& img); @@ -303,6 +313,8 @@ private: double m_scale; wxHtmlImageMapCell *m_imageMap; wxString m_mapName; + + DECLARE_NO_COPY_CLASS(wxHtmlImageCell) }; #if wxUSE_GIF && wxUSE_TIMER @@ -317,55 +329,16 @@ class wxGIFTimer : public wxTimer private: wxHtmlImageCell *m_cell; + + DECLARE_NO_COPY_CLASS(wxGIFTimer) }; #endif -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxHtmlImageCell -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- -/* XPM */ -static const char * broken_image_xpm[] = { -"29 31 7 1", -" c None", -". c #808080", -"+ c #FFFFFF", -"@ c #C0C0C0", -"# c #000000", -"$ c #333366", -"% c #B2B2B2", -"..................... ", -".+++++++++++++++++++.. ", -".+++++++++++++++++++.@. ", -".++@@@@@@@@@@@@@@@@@.+@. ", -".++@@@@@@@@@@@@@@@@@.++@. ", -".++@@@@@.@@@@.@@@@@@.+++@. ", -".++@@@@@@@@@@@@@@@@@.++++@. ", -".++@@@@@@@@@@@@@@@@@.+++++@. ", -".++@@.@@@@@@@@@@.@@@######## ", -".++@@@@@@@@@@@@@@@@@@$$$$$$#.", -".######@@@@@@@@@@@@@@@.....#.", -" ###@@@@@@@@@@@@@@@++#.", -" #####@@@@@@@@@@++#.", -" #@.@@@@@@@@++#.", -".. ###@@@@@@@++#.", -".+.... #@@@@@@++#.", -".++@@@... ####@@++#.", -".++@@@@@@.. #####.", -".++@@@@@@@@... ", -".++@@@@@@%%%%@. ", -".++@@@@@@%%%%@@.... ", -".++@@@@@@%%%%@@@@@@.... ", -".++@@@@@@%%%%@@@@@@@@@@.... ", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++++++++++++++++++++++++++#.", -".++++++++++++++++++++++++++#.", -"############################."}; wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, int w, int h, double scale, int align, @@ -447,7 +420,8 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, if ( m_bmpW == -1 ) m_bmpW = 31; if ( m_bmpH == -1 ) m_bmpH = 33; } - m_bitmap = new wxBitmap(broken_image_xpm); + m_bitmap = + new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); } } //else: ignore the 0-sized images used sometimes on the Web pages @@ -554,7 +528,9 @@ wxHtmlImageCell::~wxHtmlImageCell() } -void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) +void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingState& WXUNUSED(state)) { if ( m_showFrame ) {