Bug fix in GetLabelFromText

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

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 96e6b112dddc848c2ee982d637548d29fa1c5628..a7f1f297e74ad41b97cd283ece24ec49f254827c 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -60,7 +60,7 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
         int radius;
     public:
         wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0);
-        virtual wxString GetLink( int x = 0, int y = 0 ) const;
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
 };
 
 
@@ -80,7 +80,7 @@ wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype
     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) {
         case RECT:
@@ -181,7 +181,7 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
         wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;
         return a->GetLink( x, y );
     }
-    return wxEmptyString;
+    return NULL;
 }
 
 
@@ -206,7 +206,7 @@ class wxHtmlImageMapCell : public wxHtmlCell
     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;
 };
 
@@ -216,7 +216,7 @@ wxHtmlImageMapCell::wxHtmlImageMapCell( wxString &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;
     if (a)
@@ -252,7 +252,7 @@ class wxHtmlImageCell : public wxHtmlCell
         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;
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
 };
 
 
@@ -310,7 +310,7 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
     wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
 }
 
-wxString wxHtmlImageCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 {
     if (m_MapName.IsEmpty())
         return wxHtmlCell::GetLink( x, y );
@@ -346,27 +346,27 @@ 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 );
                     }
                 }
@@ -382,11 +382,11 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 }
             }
         }
-        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,25 +394,27 @@ 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");
-                    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 );
             }