wxMessageBox off the main thread lost result code.

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

diff --git a/src/html/m_links.cpp b/src/html/m_links.cpp
index ec482a88e64163e1f2e6461ac9cd03817c6a20cb..4dfebdc2e6400dc66721b62dc61f081ad46411dd 100644 (file)
--- a/src/html/m_links.cpp
+++ b/src/html/m_links.cpp
@@ -61,12 +61,14 @@ TAG_HANDLER_BEGIN(A, "A")
 
     TAG_HANDLER_PROC(tag)
     {
-        if (tag.HasParam( wxT("NAME") ))
+        wxString name;
+        if (tag.GetParamAsString(wxT("NAME"), &name))
         {
-            m_WParser->GetContainer()->InsertCell(new wxHtmlAnchorCell(tag.GetParam( wxT("NAME") )));
+            m_WParser->GetContainer()->InsertCell(new wxHtmlAnchorCell(name));
         }
 
-        if (tag.HasParam( wxT("HREF") ))
+        wxString href;
+        if (tag.GetParamAsString(wxT("HREF"), &href))
         {
             wxHtmlLinkInfo oldlnk = m_WParser->GetLink();
             wxColour oldclr = m_WParser->GetActualColor();
@@ -77,16 +79,14 @@ TAG_HANDLER_BEGIN(A, "A")
             int olditalic = m_WParser->GetFontItalic();
             int oldund = m_WParser->GetFontUnderlined();
             wxString oldfontface = m_WParser->GetFontFace();
-            wxString name(tag.GetParam( wxT("HREF") )), target;
-
-            if (tag.HasParam( wxT("TARGET") )) target = tag.GetParam( wxT("TARGET") );
+            wxString target = tag.GetParam( wxT("TARGET") );
 
             // set default styles, might get overridden by ApplyStyle
             m_WParser->SetActualColor(m_WParser->GetLinkColor());
             m_WParser->GetContainer()->InsertCell(new wxHtmlColourCell(m_WParser->GetLinkColor()));
             m_WParser->SetFontUnderlined(true);
             m_WParser->GetContainer()->InsertCell(new wxHtmlFontCell(m_WParser->CreateCurrentFont()));
-            m_WParser->SetLink(wxHtmlLinkInfo(name, target));
+            m_WParser->SetLink(wxHtmlLinkInfo(href, target));
 
             // Load any style parameters
             wxHtmlStyleParams styleParams(tag);