added possibility to throw different objects and crash directly from the main frame...

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index ff3f4ea0bd1fbf6c09f4f68f8a50beac9c9b0ad3..0dbab9d1f9db9cccf65f5e07f37d80e5bdf142a4 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -32,7 +32,7 @@
 #include "wx/fontmap.h"
 #include "wx/log.h"
 #include "wx/settings.h"
 #include "wx/fontmap.h"
 #include "wx/log.h"
 #include "wx/settings.h"

-#include "wx/url.h"
+#include "wx/uri.h"

 
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------


@@ -193,7 +193,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
                  */
 
     m_UseLink = false;
                  */
 
     m_UseLink = false;

-    m_Link = wxHtmlLinkInfo( wxT(""), wxT("") );
+    m_Link = wxHtmlLinkInfo( wxEmptyString );

     m_LinkColor.Set(0, 0, 0xFF);
     m_ActualColor.Set(0, 0, 0);
     m_Align = wxHTML_ALIGN_LEFT;
     m_LinkColor.Set(0, 0, 0xFF);
     m_ActualColor.Set(0, 0, 0);
     m_Align = wxHTML_ALIGN_LEFT;


@@ -257,36 +257,34 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type,
         {
             wxString myfullurl(myurl);
 
         {
             wxString myfullurl(myurl);
 

-#if wxUSE_URL

             // consider url as absolute path first
             // consider url as absolute path first

-            wxURL current(wxURL::Unescape(myurl));
-            myfullurl = current.GetURL();
+            wxURI current(myurl);
+            myfullurl = current.BuildUnescapedURI();

 
             // if not absolute then ...
             if( current.IsReference() )
             {
                 wxString basepath = GetFS()->GetPath();
 
             // if not absolute then ...
             if( current.IsReference() )
             {
                 wxString basepath = GetFS()->GetPath();

-                wxURI base(wxURL::Unescape(basepath));
+                wxURI base(basepath);

 
 

-                // try to apply base path if valid ...
+                // ... try to apply base path if valid ...

                 if( !base.IsReference() )
                 {
                     wxURI path(myfullurl);
                     path.Resolve( base );
                 if( !base.IsReference() )
                 {
                     wxURI path(myfullurl);
                     path.Resolve( base );

-                    myfullurl = path.BuildURI();
+                    myfullurl = path.BuildUnescapedURI();

                 }
                 else
                 {
                     // ... or force such addition if not included already
                 }
                 else
                 {
                     // ... or force such addition if not included already

-                    if( !current.GetURL().Contains(basepath) )
+                    if( !current.GetPath().Contains(base.GetPath()) )

                     {
                         basepath += myurl;
                     {
                         basepath += myurl;

-                        wxURL connected( wxURL::Unescape(basepath) );
-                        myfullurl = connected.GetURL();
+                        wxURI connected( basepath );
+                        myfullurl = connected.BuildUnescapedURI();

                     }
                 }
             }
                     }
                 }
             }

-#endif

 
             wxString redirect;
             status = m_Window->OnOpeningURL(type, myfullurl, &redirect);
 
             wxString redirect;
             status = m_Window->OnOpeningURL(type, myfullurl, &redirect);