Added style parameter to wxPopupWindow ctors so they match the Create method.

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

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 3d1f375088b775fc02ffce890f5940b62deed3b5..396edda93d32d60bbae637c8a447024d0eded04c 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mod_image.cpp
+// Name:        m_image.cpp

 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -14,27 +14,29 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/dc.h"
+    #include "wx/scrolwin.h"
+    #include "wx/timer.h"

 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 

-

 #include "wx/image.h"
 #include "wx/image.h"

+#include "wx/gifdecod.h"

 #include "wx/dynarray.h"
 
 #include <math.h>
 #include <float.h>
 
 #include "wx/dynarray.h"
 
 #include <math.h>
 #include <float.h>
 

-FORCE_LINK_ME(mod_image)
+FORCE_LINK_ME(m_image)

 
 
 
 
 
 


@@ -57,112 +59,134 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
     protected:
         CoordArray coords;
         celltype type;
     protected:
         CoordArray coords;
         celltype type;

-        int    radius;
+        int radius;

     public:
     public:

-        wxHtmlImageMapAreaCell( celltype t, wxString &coords );
-        virtual wxString GetLink( int x = 0, int y = 0 ) const;
+        wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0);
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;

 };
 
 
 
 
 
 };
 
 
 
 
 

-wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype t, wxString &incoords )
+wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype t, wxString &incoords, double pixel_scale )

 {
 {

-    int        i;
+    int i;

     wxString x = incoords, y;
 
     type = t;
     wxString x = incoords, y;
 
     type = t;

-    while ((i = x.Find( ',' )) != -1) {
-        coords.Add( wxAtoi( x.Left( i ).c_str() ) );
+    while ((i = x.Find( ',' )) != -1)
+    {
+        coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) );

         x = x.Mid( i + 1 );
     }
         x = x.Mid( i + 1 );
     }

-    coords.Add( wxAtoi( x.c_str() ) );
+    coords.Add( (int)(pixel_scale * (double)wxAtoi( x.c_str())) );

 }
 
 }
 

-wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const

 {
 {

-    switch (type) {
+    switch (type)
+    {

         case RECT:
             {
         case RECT:
             {

-                int    l, t, r, b;
+                int l, t, r, b;

 
                 l = coords[ 0 ];
                 t = coords[ 1 ];
                 r = coords[ 2 ];
                 b = coords[ 3 ];
 
                 l = coords[ 0 ];
                 t = coords[ 1 ];
                 r = coords[ 2 ];
                 b = coords[ 3 ];

-                if (x >= l && x <= r && y >= t && y <= b) {
+                if (x >= l && x <= r && y >= t && y <= b)
+                {

                     return m_Link;
                 }
                 break;
             }
         case CIRCLE:
             {
                     return m_Link;
                 }
                 break;
             }
         case CIRCLE:
             {

-                int    l, t, r;
-                double d;
+                int l, t, r;
+                double  d;

 
                 l = coords[ 0 ];
                 t = coords[ 1 ];
                 r = coords[ 2 ];
                 d = sqrt( (double) (((x - l) * (x - l)) + ((y - t) * (y - t))) );
 
                 l = coords[ 0 ];
                 t = coords[ 1 ];
                 r = coords[ 2 ];
                 d = sqrt( (double) (((x - l) * (x - l)) + ((y - t) * (y - t))) );

-                if (d < (double)r) {
+                if (d < (double)r)
+                {

                     return m_Link;
                 }
             }
             break;
         case POLY:
             {
                     return m_Link;
                 }
             }
             break;
         case POLY:
             {

-                if (coords.GetCount() >= 6) {
-                    int        intersects = 0;
-                    int        wherex = x;
-                    int        wherey = y;
-                    int        totalv = coords.GetCount() / 2;
-                    int        totalc = totalv * 2;
-                    int        xval = coords[totalc - 2];
-                    int        yval = coords[totalc - 1];
-                    int        end = totalc;
-                    int        pointer = 1;
-
-                    if ((yval >= wherey) != (coords[pointer] >= wherey)) {
-                        if ((xval >= wherex) == (coords[0] >= wherex)) {
+                if (coords.GetCount() >= 6)
+                {
+                    int intersects = 0;
+                    int wherex = x;
+                    int wherey = y;
+                    int totalv = coords.GetCount() / 2;
+                    int totalc = totalv * 2;
+                    int xval = coords[totalc - 2];
+                    int yval = coords[totalc - 1];
+                    int end = totalc;
+                    int pointer = 1;
+
+                    if ((yval >= wherey) != (coords[pointer] >= wherey))
+                    {
+                        if ((xval >= wherex) == (coords[0] >= wherex))
+                        {

                             intersects += (xval >= wherex) ? 1 : 0;
                             intersects += (xval >= wherex) ? 1 : 0;

-                        } else {
+                        }
+                        else
+                        {

                             intersects += ((xval - (yval - wherey) *
                                             (coords[0] - xval) /
                                             (coords[pointer] - yval)) >= wherex) ? 1 : 0;
                         }
                     }
 
                             intersects += ((xval - (yval - wherey) *
                                             (coords[0] - xval) /
                                             (coords[pointer] - yval)) >= wherex) ? 1 : 0;
                         }
                     }
 

-                    while (pointer < end) {
+                    while (pointer < end)
+                    {

                         yval = coords[pointer];
                         pointer += 2;
                         yval = coords[pointer];
                         pointer += 2;

-                        if (yval >= wherey) {
-                            while ((pointer < end) && (coords[pointer] >= wherey)) {
+                        if (yval >= wherey)
+                        {
+                            while ((pointer < end) && (coords[pointer] >= wherey))
+                            {

                                 pointer += 2;
                             }
                                 pointer += 2;
                             }

-                            if (pointer >= end) {
+                            if (pointer >= end)
+                            {

                                 break;
                             }
                             if ((coords[pointer - 3] >= wherex) ==
                                     (coords[pointer - 1] >= wherex)) {
                                 intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
                                 break;
                             }
                             if ((coords[pointer - 3] >= wherex) ==
                                     (coords[pointer - 1] >= wherex)) {
                                 intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;

-                            } else {
+                            }
+                            else
+                            {

                                 intersects +=
                                     ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
                                       (coords[pointer - 1] - coords[pointer - 3]) /
                                       (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0;
                             }
                                 intersects +=
                                     ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
                                       (coords[pointer - 1] - coords[pointer - 3]) /
                                       (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0;
                             }

-                        } else {
-                            while ((pointer < end) && (coords[pointer] < wherey)) {
+                        }
+                        else
+                        {
+                            while ((pointer < end) && (coords[pointer] < wherey))
+                            {

                                 pointer += 2;
                             }
                                 pointer += 2;
                             }

-                            if (pointer >= end) {
+                            if (pointer >= end)
+                            {

                                 break;
                             }
                             if ((coords[pointer - 3] >= wherex) ==
                                 break;
                             }
                             if ((coords[pointer - 3] >= wherex) ==

-                                    (coords[pointer - 1] >= wherex)) {
+                                    (coords[pointer - 1] >= wherex))
+                            {

                                 intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
                                 intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;

-                            } else {
+                            }
+                            else
+                            {

                                 intersects +=
                                     ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
                                       (coords[pointer - 1] - coords[pointer - 3]) /
                                 intersects +=
                                     ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
                                       (coords[pointer - 1] - coords[pointer - 3]) /


@@ -170,18 +194,21 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
                             }
                         }
                     }
                             }
                         }
                     }

-                    if ((intersects & 1) != 0) {
+                    if ((intersects & 1) != 0)
+                    {

                         return m_Link;
                     }
                 }
             }
             break;
     }
                         return m_Link;
                     }
                 }
             }
             break;
     }

-    if (m_Next) {
-        wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next;
+
+    if (m_Next)
+    {
+        wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;

         return a->GetLink( x, y );
     }
         return a->GetLink( x, y );
     }

-    return wxEmptyString;
+    return NULL;

 }
 
 
 }
 
 


@@ -206,7 +233,7 @@ class wxHtmlImageMapCell : public wxHtmlCell
     protected:
         wxString m_Name;
     public:
     protected:
         wxString m_Name;
     public:

-        virtual wxString GetLink( int x = 0, int y = 0 ) const;
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;

         virtual const wxHtmlCell *Find( int cond, const void *param ) const;
 };
 
         virtual const wxHtmlCell *Find( int cond, const void *param ) const;
 };
 


@@ -216,9 +243,9 @@ wxHtmlImageMapCell::wxHtmlImageMapCell( wxString &name )
     m_Name = name ;
 }
 
     m_Name = name ;
 }
 

-wxString wxHtmlImageMapCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageMapCell::GetLink( int x, int y ) const

 {
 {

-    wxHtmlImageMapAreaCell     *a = (wxHtmlImageMapAreaCell*)m_Next;
+    wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;

     if (a)
         return a->GetLink( x, y );
     return wxHtmlCell::GetLink( x, y );
     if (a)
         return a->GetLink( x, y );
     return wxHtmlCell::GetLink( x, y );


@@ -226,7 +253,8 @@ wxString wxHtmlImageMapCell::GetLink( int x, int y ) const
 
 const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 {
 
 const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 {

-    if (cond == wxHTML_COND_ISIMAGEMAP) {
+    if (cond == wxHTML_COND_ISIMAGEMAP)
+    {

         if (m_Name == *((wxString*)(param)))
             return this;
     }
         if (m_Name == *((wxString*)(param)))
             return this;
     }


@@ -244,46 +272,120 @@ const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 
 class wxHtmlImageCell : public wxHtmlCell
 {
 
 class wxHtmlImageCell : public wxHtmlCell
 {

-    public:
-        wxBitmap *m_Image;
-        wxHtmlImageMapCell *m_ImageMap;
-        wxString m_MapName;
-
-        wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, 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 wxString GetLink( int x = 0, int y = 0 ) const;
+public:
+    wxHtmlImageCell(wxWindow *window,
+                    wxFSFile *input, int w = -1, int h = -1, 
+                    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);
+    virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
+
+    void SetImage(const wxImage& img);
+#if wxUSE_GIF && wxUSE_TIMER
+    void AdvanceAnimation(wxTimer *timer);
+    virtual void Layout(int w);
+#endif
+
+private:
+    wxBitmap           *m_bitmap;
+    int                 m_bmpW, m_bmpH;
+    wxScrolledWindow   *m_window;
+#if wxUSE_GIF && wxUSE_TIMER
+    wxGIFDecoder       *m_gifDecoder;
+    wxTimer            *m_gifTimer;
+    int                 m_physX, m_physY;
+#endif
+    double              m_scale;
+    wxHtmlImageMapCell *m_imageMap;
+    wxString            m_mapName;

 };
 
 };
 

+#if wxUSE_GIF && wxUSE_TIMER
+class wxGIFTimer : public wxTimer
+{
+    public:
+        wxGIFTimer(wxHtmlImageCell *cell) : m_cell(cell) {}
+        virtual void Notify()
+        {
+            m_cell->AdvanceAnimation(this);
+        }

 
 

+    private:
+        wxHtmlImageCell *m_cell;
+};
+#endif

 
 
 //--------------------------------------------------------------------------------
 // wxHtmlImageCell
 //--------------------------------------------------------------------------------
 
 
 
 //--------------------------------------------------------------------------------
 // wxHtmlImageCell
 //--------------------------------------------------------------------------------
 

-wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxString mapname) : wxHtmlCell()
+wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, 
+                                 int w, int h, double scale, int align, 
+                                 const wxString& mapname) : wxHtmlCell()

 {
 {

-    wxImage *img;
-    int ww, hh;
-    wxInputStream *s = input -> GetStream();
-
-    img = new wxImage(*s, wxBITMAP_TYPE_ANY);
-
-    m_Image = NULL;
-    if (img && (img -> Ok())) {
-        ww = img -> GetWidth();
-        hh = img -> GetHeight();
-        if (w != -1) m_Width = w; else m_Width = ww;
-        if (h != -1) m_Height = h; else m_Height = hh;
-        if ((m_Width != ww) || (m_Height != hh)) {
-            wxImage img2 = img -> Scale(m_Width, m_Height);
-            m_Image = new wxBitmap(img2.ConvertToBitmap());
-        } else
-            m_Image = new wxBitmap(img -> ConvertToBitmap());
-        delete img;
+    m_window = wxStaticCast(window, wxScrolledWindow);
+    m_scale = scale;
+    m_bitmap = NULL;
+    m_bmpW = w;
+    m_bmpH = h;
+    m_imageMap = NULL;
+    m_mapName = mapname;
+    SetCanLiveOnPagebreak(FALSE);
+#if wxUSE_GIF && wxUSE_TIMER
+    m_gifDecoder = NULL;
+    m_gifTimer = NULL;
+    m_physX = m_physY = -1;
+#endif
+
+    wxInputStream *s = input->GetStream();
+    
+    if ( s )
+    {
+        bool readImg = TRUE;
+        
+#if wxUSE_GIF && wxUSE_TIMER
+        if ( (input->GetLocation().Matches(wxT("*.gif")) ||
+              input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
+        {
+            m_gifDecoder = new wxGIFDecoder(s, TRUE);
+            if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
+            {
+                wxImage img;
+                if ( m_gifDecoder->ConvertToImage(&img) )
+                    SetImage(img);
+
+                readImg = FALSE;
+
+                if ( m_gifDecoder->IsAnimation() )
+                {
+                    m_gifTimer = new wxGIFTimer(this);
+                    m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE);
+                }
+                else
+                {
+                    wxDELETE(m_gifDecoder);
+                }
+            }
+            else
+            {
+                wxDELETE(m_gifDecoder);
+            }
+        }
+
+        if ( readImg )
+#endif
+        {
+            SetImage(wxImage(*s, wxBITMAP_TYPE_ANY));
+        }

     }
     }

-    switch (align) {
+
+    m_Width = (int)(scale * (double)m_bmpW);
+    m_Height = (int)(scale * (double)m_bmpH);
+
+    switch (align)
+    {

         case wxHTML_ALIGN_TOP :
             m_Descent = m_Height;
             break;
         case wxHTML_ALIGN_TOP :
             m_Descent = m_Height;
             break;


@@ -295,45 +397,124 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr
             m_Descent = 0;
             break;
     }
             m_Descent = 0;
             break;
     }

+ }

 
 

-    m_ImageMap = NULL;
-    m_MapName = mapname;
-    SetCanLiveOnPagebreak(FALSE);
+void wxHtmlImageCell::SetImage(const wxImage& img)
+{
+    if ( img.Ok() )
+    {
+        delete m_bitmap;
+
+        int ww, hh;
+        ww = img.GetWidth();
+        hh = img.GetHeight();
+
+        if ( m_bmpW == -1 )
+            m_bmpW = ww;
+        if ( m_bmpH == -1 )
+            m_bmpH = hh;
+
+        if ((m_bmpW != ww) || (m_bmpH != hh))
+        {
+            wxImage img2 = img.Scale(m_bmpW, m_bmpH);
+            m_bitmap = new wxBitmap(img2);
+        }
+        else
+            m_bitmap = new wxBitmap(img);
+    }
+}
+
+#if wxUSE_GIF && wxUSE_TIMER
+void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
+{
+    wxImage img;
+
+    m_gifDecoder->GoNextFrame(TRUE);
+
+    if ( m_physX == -1 )
+    {
+        m_physX = m_physY = 0;
+        for (wxHtmlCell *cell = this; cell; cell = cell->GetParent())
+        {
+            m_physX += cell->GetPosX();
+            m_physY += cell->GetPosY();
+        }
+    }
+
+    int x, y;
+    m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y);
+    wxRect rect(x, y, m_Width, m_Height);
+
+    if ( m_window->GetClientRect().Intersects(rect) && 
+         m_gifDecoder->ConvertToImage(&img) )
+    {
+        SetImage(img);
+        m_window->Refresh(img.HasMask(), &rect);
+    }
+
+    timer->Start(m_gifDecoder->GetDelay(), TRUE);

 }
 
 }
 

+void wxHtmlImageCell::Layout(int w)
+{
+    wxHtmlCell::Layout(w);
+    m_physX = m_physY = -1;
+}

 
 

+#endif

 
 

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

 {
 {

-    if (m_Image)
-        dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE);
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
+    delete m_bitmap;
+#if wxUSE_GIF && wxUSE_TIMER
+    delete m_gifTimer;
+    delete m_gifDecoder;
+#endif

 }
 
 }
 

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

 {
 {

-    if (m_MapName.IsEmpty())
+    if (m_bitmap)
+    {
+        double us_x, us_y;
+        dc.GetUserScale(&us_x, &us_y);
+        dc.SetUserScale(us_x * m_scale, us_y * m_scale);
+
+        dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / m_scale),
+                                 (int) ((y + m_PosY) / m_scale), TRUE);
+        dc.SetUserScale(us_x, us_y);
+    }
+}
+
+wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
+{
+    if (m_mapName.IsEmpty())

         return wxHtmlCell::GetLink( x, y );
         return wxHtmlCell::GetLink( x, y );

-    if (!m_ImageMap) {
-        wxHtmlContainerCell    *p, *op;
+    if (!m_imageMap)
+    {
+        wxHtmlContainerCell *p, *op;

         op = p = GetParent();
         op = p = GetParent();

-        while (p) {
+        while (p)
+        {

             op = p;
             p = p->GetParent();
         }
         p = op;
             op = p;
             p = p->GetParent();
         }
         p = op;

-        wxHtmlCell *cell = (wxHtmlCell*)p->Find( wxHTML_COND_ISIMAGEMAP, (const void*)(&m_MapName));
-        if (!cell) {
-            ((wxString&)m_MapName).Clear();
+        wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP, 
+                                                (const void*)(&m_mapName));
+        if (!cell)
+        {
+            ((wxString&)m_mapName).Clear();

             return wxHtmlCell::GetLink( x, y );
         }
             return wxHtmlCell::GetLink( x, y );
         }

-        { // dirty hack, ask Joel why he fills m_ImageMap in this place
+        {   // dirty hack, ask Joel why he fills m_ImageMap in this place

             // THE problem is that we're in const method and we can't modify m_ImageMap
             // THE problem is that we're in const method and we can't modify m_ImageMap

-            wxHtmlImageMapCell **cx = (wxHtmlImageMapCell**)(&m_ImageMap);
+            wxHtmlImageMapCell **cx = (wxHtmlImageMapCell**)(&m_imageMap);

             *cx = (wxHtmlImageMapCell*)cell;
         }
     }
             *cx = (wxHtmlImageMapCell*)cell;
         }
     }

-    return m_ImageMap->GetLink( x, y );
+    return m_imageMap->GetLink(x, y);

 }
 
 
 }
 
 


@@ -346,44 +527,60 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
 
     TAG_HANDLER_PROC(tag)
     {
 
     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;
                 int w = -1, h = -1;
                 int al;
                 wxFSFile *str;

-                wxString tmp = tag.GetParam("SRC");
+                wxString tmp = tag.GetParam(wxT("SRC"));

                 wxString mn = wxEmptyString;
 
                 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);
+                str = m_WParser->GetFS()->OpenFile(tmp);
+                if (tag.HasParam(wxT("WIDTH")))
+                    tag.GetParamAsInt(wxT("WIDTH"), &w);
+                if (tag.HasParam(wxT("HEIGHT")))
+                    tag.GetParamAsInt(wxT("HEIGHT"), &h);

                 al = wxHTML_ALIGN_BOTTOM;
                 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 ".."
                     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[ 0 ] == '#') {
+                if (tag.HasParam(wxT("USEMAP")))
+                {
+                    mn = tag.GetParam( wxT("USEMAP") );
+                    if (mn.GetChar(0) == wxT('#'))
+                    {

                         mn = mn.Mid( 1 );
                     }
                 }
                 wxHtmlImageCell *cel = NULL;
                         mn = mn.Mid( 1 );
                     }
                 }
                 wxHtmlImageCell *cel = NULL;

-                if (str) {
-                    cel = new wxHtmlImageCell(str, w, h, al, mn);
-                    cel -> SetLink(m_WParser -> GetLink());
-                    m_WParser -> GetContainer() -> InsertCell(cel);
+                if (str)
+                {
+                    cel = new wxHtmlImageCell(m_WParser->GetWindow(),
+                                              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;
                 }
             }
         }
                     delete str;
                 }
             }
         }

-        if (tag.GetName() == "MAP") {
+        if (tag.GetName() == wxT("MAP"))
+        {

             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
             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 );
             }
                 wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp );
                 m_WParser->GetContainer()->InsertCell( cel );
             }


@@ -391,25 +588,36 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
         }
             m_WParser->CloseContainer();
             m_WParser->OpenContainer();
         }

-        if (tag.GetName() == "AREA") {
-            if (tag.HasParam("SHAPE")) {
-                wxString tmp = tag.GetParam("SHAPE");
-                wxString coords;
+        if (tag.GetName() == wxT("AREA"))
+        {
+            if (tag.HasParam(wxT("SHAPE")))
+            {
+                wxString tmp = tag.GetParam(wxT("SHAPE"));
+                wxString coords = wxEmptyString;

                 tmp.MakeUpper();
                 wxHtmlImageMapAreaCell *cel = NULL;
                 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 == wxT("POLY"))
+                {
+                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords, m_WParser->GetPixelScale() );
+                }
+                else if (tmp == wxT("CIRCLE"))
+                {
+                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords, m_WParser->GetPixelScale() );

                 }
                 }

-                if (tmp == "POLY") {
-                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords );
-                } else if (tmp == "CIRCLE") {
-                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords );
-                } else if (tmp == "RECT") {
-                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords );
+                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");
-                    cel->SetLink( tmp );
+                if (cel != NULL && tag.HasParam(wxT("HREF")))
+                {
+                    wxString tmp = tag.GetParam(wxT("HREF"));
+                    wxString target = wxEmptyString;
+                    if (tag.HasParam(wxT("TARGET"))) target = tag.GetParam(wxT("TARGET"));
+                    cel->SetLink( wxHtmlLinkInfo(tmp, target));

                 }
                 if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );
             }
                 }
                 if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );
             }