fixed code in OpenURL() to actually use the result of OnOpeningURL()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 86dbfd1b90c53761952de9c718baf3859727c67b..151573bd3f72f7cb5eb5327dc21efc3615a34f68 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -180,24 +180,25 @@ wxObject* wxHtmlWinParser::GetProduct()
     return top;
 }
 
     return top;
 }
 

-wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, 
+wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,

                                    const wxString& url) const
 {
     // FIXME - normalize the URL to full path before passing to
     //         OnOpeningURL!!
     if ( m_Window )
     {
                                    const wxString& url) const
 {
     // FIXME - normalize the URL to full path before passing to
     //         OnOpeningURL!!
     if ( m_Window )
     {

-        wxString redirect;

         wxString myurl(url);
         wxHtmlOpeningStatus status;
         for (;;)
         {
         wxString myurl(url);
         wxHtmlOpeningStatus status;
         for (;;)
         {

-            if ( m_Window->OnOpeningURL(type, myurl, &redirect) == wxHTML_REDIRECT )
-                myurl = redirect;
-            else
+            wxString redirect;
+            status = m_Window->OnOpeningURL(type, myurl, &redirect);
+            if ( status != wxHTML_REDIRECT )

                 break;
                 break;

+
+            myurl = redirect;

         }
         }

-        
+

         if ( status == wxHTML_BLOCK )
             return NULL;
         else
         if ( status == wxHTML_BLOCK )
             return NULL;
         else