added wxTreeEvent::GetKeyEvent() to allow to retrieve the key event flags from EVT_TR...

[wxWidgets.git] / src / html / m_image.cpp

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 85e8f274d7810d4085d815d676d4b1dd76f43069..494accba1fd4d8399a9bb49b20f4ae38e417e18c 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -337,7 +337,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, in
 
 
 
 
 
 

-void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))

 {
     if (m_Image)
     {
 {
     if (m_Image)
     {


@@ -350,7 +350,6 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
                                 (int) ((y + m_PosY) / m_Scale), TRUE);
         dc.SetUserScale(us_x, us_y);
     }
                                 (int) ((y + m_PosY) / m_Scale), TRUE);
         dc.SetUserScale(us_x, us_y);
     }

-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);

 }
 
 wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 }
 
 wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const


@@ -430,6 +429,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 {
                     cel = new wxHtmlImageCell(str, w, h, m_WParser->GetPixelScale(), al, mn);
                     cel->SetLink(m_WParser->GetLink());
                 {
                     cel = new wxHtmlImageCell(str, w, h, m_WParser->GetPixelScale(), al, mn);
                     cel->SetLink(m_WParser->GetLink());

+                    cel->SetId(tag.GetParam(wxT("id"))); // may be empty

                     m_WParser->GetContainer()->InsertCell(cel);
                     delete str;
                 }
                     m_WParser->GetContainer()->InsertCell(cel);
                     delete str;
                 }