wxURI is enough for the basic url operations.

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

diff --git a/contrib/samples/gizmos/dynsash/dynsash.bkl b/contrib/samples/gizmos/dynsash/dynsash.bkl
index ab6cddf118d01216032412a0a4a6b0699028e3b5..640ba00078fa377da87784ccba580b4179a1eb16 100644 (file)
--- a/contrib/samples/gizmos/dynsash/dynsash.bkl
+++ b/contrib/samples/gizmos/dynsash/dynsash.bkl
@@ -11,7 +11,6 @@
         <wx-lib>gizmos</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>gizmos</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
     </exe>
 
         <wx-lib>base</wx-lib>
     </exe>
 

diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl
index 48a1737a6333ac0fd013e3c7fc4997f5d3efbaa2..da36eac77ef86219fcc75f5493df1262f980b58b 100644 (file)
--- a/contrib/samples/ogl/studio/studio.bkl
+++ b/contrib/samples/ogl/studio/studio.bkl
@@ -23,15 +23,14 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>studio.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>studio.rc</win32-res>
     </exe>

-    
+

     <wx-data id="data">
         <files>
             studio_resources.wxr
         </files>
     </wx-data>
     <wx-data id="data">
         <files>
             studio_resources.wxr
         </files>
     </wx-data>

-    
+

 </makefile>
 </makefile>

diff --git a/contrib/utils/wxrcedit/wxrcedit.bkl b/contrib/utils/wxrcedit/wxrcedit.bkl
index cd1d2f0572d815e1bdff69d998017c65c04749ae..804ac66a577cb1938e9db7b97e02a9035aaa49ac 100644 (file)
--- a/contrib/utils/wxrcedit/wxrcedit.bkl
+++ b/contrib/utils/wxrcedit/wxrcedit.bkl
@@ -23,7 +23,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>wxrcedit.rc</win32-res>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>
         <wx-lib>base</wx-lib>
         <win32-res>wxrcedit.rc</win32-res>
         <ldlibs>$(EXTRALIBS_XML)</ldlibs>

diff --git a/demos/dbbrowse/dbbrowse.bkl b/demos/dbbrowse/dbbrowse.bkl
index 53ea35bf668f23c07c0e358e98b4c463ab54e85e..e00c06a951ede7980fa6db4d961fa5192cc95d34 100644 (file)
--- a/demos/dbbrowse/dbbrowse.bkl
+++ b/demos/dbbrowse/dbbrowse.bkl
@@ -19,7 +19,6 @@
         <wx-lib>odbc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>odbc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>dbbrowse.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>dbbrowse.rc</win32-res>
     </exe>

diff --git a/demos/forty/forty.bkl b/demos/forty/forty.bkl
index cc5ac9a99ae0060c930d4ce77b5e22222558d6fb..3296588c40e9df2819d20dbdc0ac21efffa5390a 100644 (file)
--- a/demos/forty/forty.bkl
+++ b/demos/forty/forty.bkl
@@ -17,7 +17,6 @@
         <wx-lib>html</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>forty.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>forty.rc</win32-res>
     </exe>

diff --git a/demos/poem/poem.bkl b/demos/poem/poem.bkl
index 8143cf0b69120b947ed19ed5df931a10403ce202..d940be925895f78750e025a62db9069c39f99e87 100644 (file)
--- a/demos/poem/poem.bkl
+++ b/demos/poem/poem.bkl
@@ -7,11 +7,10 @@
         <sources>wxpoem.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>wxpoem.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>wxpoem.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>wxpoem.rc</win32-res>
     </exe>

-   
+

     <wx-data id="data">
         <files>
             wxpoem.txt wxpoem.dat
     <wx-data id="data">
         <files>
             wxpoem.txt wxpoem.dat

diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index edb5d35d4db81bc61b798cb3027aba717a3038ee..2d0a70fb88f77804053d8886f2fd63d91cdcdcbc 100644 (file)
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -7,7 +7,6 @@
         <sources>demo.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>demo.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>demo.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>demo.rc</win32-res>
     </exe>


@@ -31,7 +30,7 @@
             up.gif
         </files>
     </wx-data>
             up.gif
         </files>
     </wx-data>

-    
+

     <wx-data id="data_doc">
         <dstdir>$(BUILDDIR)/doc</dstdir>
         <srcdir>$(SRCDIR)/doc</srcdir>
     <wx-data id="data_doc">
         <dstdir>$(BUILDDIR)/doc</dstdir>
         <srcdir>$(SRCDIR)/doc</srcdir>

diff --git a/samples/htlbox/htlbox.bkl b/samples/htlbox/htlbox.bkl
index 5c417b995c6f1df32c47a8f4ae5fb40d43242f58..3105bc4d6b318c4c4ab8606e2498cd98300ca002 100644 (file)
--- a/samples/htlbox/htlbox.bkl
+++ b/samples/htlbox/htlbox.bkl
@@ -7,7 +7,6 @@
         <sources>htlbox.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>htlbox.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>htlbox.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>htlbox.rc</win32-res>
     </exe>

diff --git a/samples/html/about/about.bkl b/samples/html/about/about.bkl
index 11b5b7fff972eb1e9d97d9647003f8d9b362bfe6..473530efeead0132e46def1b84ee0287c0fe683d 100644 (file)
--- a/samples/html/about/about.bkl
+++ b/samples/html/about/about.bkl
@@ -9,7 +9,6 @@
         <sources>about.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>about.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>about.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>about.rc</win32-res>
     </exe>

diff --git a/samples/html/help/help.bkl b/samples/html/help/help.bkl
index 771ea1978a7d00c8233f691ba97638cff85d8fda..6bc0a74eb0ea3f8cf5c1f5b4b538d60d1c33889d 100644 (file)
--- a/samples/html/help/help.bkl
+++ b/samples/html/help/help.bkl
@@ -9,7 +9,6 @@
         <sources>help.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>help.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>help.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>help.rc</win32-res>
     </exe>

diff --git a/samples/html/helpview/helpview.bkl b/samples/html/helpview/helpview.bkl
index 5edc6d4d36342f8ac1133b76f8b7ccad398535dc..a04699656e95758a4487d20258b9054ba2c99414 100644 (file)
--- a/samples/html/helpview/helpview.bkl
+++ b/samples/html/helpview/helpview.bkl
@@ -9,7 +9,6 @@
         <sources>helpview.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>helpview.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>helpview.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>helpview.rc</win32-res>
     </exe>

diff --git a/samples/html/printing/printing.bkl b/samples/html/printing/printing.bkl
index 5115f0f724ffe014cf1aee10a31a039ae097c446..37e7f0ad1952048d9ed2901925939ae1c9214075 100644 (file)
--- a/samples/html/printing/printing.bkl
+++ b/samples/html/printing/printing.bkl
@@ -9,7 +9,6 @@
         <sources>printing.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>printing.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <win32-res>printing.rc</win32-res>
         <wx-lib>base</wx-lib>
         <wx-lib>adv</wx-lib>
         <win32-res>printing.rc</win32-res>

diff --git a/samples/html/virtual/virtual.bkl b/samples/html/virtual/virtual.bkl
index fc8ea5eca01a84ee1da2214c4fa154f474f3b434..10c045e6a605c1534524b0b2bad7f98158fd9742 100644 (file)
--- a/samples/html/virtual/virtual.bkl
+++ b/samples/html/virtual/virtual.bkl
@@ -9,7 +9,6 @@
         <sources>virtual.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>virtual.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>virtual.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>virtual.rc</win32-res>
     </exe>

diff --git a/samples/html/widget/widget.bkl b/samples/html/widget/widget.bkl
index bba4e6319de285f2f2b9079c78f562bb86b6bdc4..82e8e709caeffe7e02cc1e3dfbe223ab47bb5e87 100644 (file)
--- a/samples/html/widget/widget.bkl
+++ b/samples/html/widget/widget.bkl
@@ -9,7 +9,6 @@
         <sources>widget.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>widget.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>widget.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>widget.rc</win32-res>
     </exe>

diff --git a/samples/html/zip/zip.bkl b/samples/html/zip/zip.bkl
index c5d40d27563b7ef419843b2cfea1579aabb8ba7e..dbf4125afd5a38d794dd3afcb5ea07742de77603 100644 (file)
--- a/samples/html/zip/zip.bkl
+++ b/samples/html/zip/zip.bkl
@@ -9,7 +9,6 @@
         <sources>zip.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <sources>zip.cpp</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>zip.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>zip.rc</win32-res>
     </exe>

diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index a2497944d42579b71f61432b0d80dc4d2a60597f..0d008d4951157e61b56b997762a51fc9818cdf39 100644 (file)
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -15,7 +15,6 @@
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <win32-res>xrcdemo.rc</win32-res>
     </exe>
         <wx-lib>base</wx-lib>
         <win32-res>xrcdemo.rc</win32-res>
     </exe>

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index ff3f4ea0bd1fbf6c09f4f68f8a50beac9c9b0ad3..2c20d8858feae4d7dbf3a60ab617e104d16b122b 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -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);

diff --git a/utils/configtool/src/configtool.bkl b/utils/configtool/src/configtool.bkl
index fcc06aaa7855b5d67c7ced4d07c5b4f6c896e75c..75ef873e9ff4a6f2f47b8cff5962381532dc620a 100644 (file)
--- a/utils/configtool/src/configtool.bkl
+++ b/utils/configtool/src/configtool.bkl
@@ -22,12 +22,11 @@
             settingsdialog.cpp
             utils.cpp
         </sources>
             settingsdialog.cpp
             utils.cpp
         </sources>

-        
+

         <wx-lib>adv</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>xml</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
     </exe>
 
         <wx-lib>base</wx-lib>
     </exe>
 


@@ -36,5 +35,5 @@
         <srcdir>$(SRCDIR)/../configs</srcdir>
         <files>wxwin250.wxs</files>
     </wx-data>
         <srcdir>$(SRCDIR)/../configs</srcdir>
         <files>wxwin250.wxs</files>
     </wx-data>

-    
+

 </makefile>
 </makefile>

diff --git a/utils/hhp2cached/hhp2cached.bkl b/utils/hhp2cached/hhp2cached.bkl
index 5535d6a251608114c7b4375eba8c5c3b6ffb2bb9..16d2e7a43cbf6a188f51c179c14165171c7921d4 100644 (file)
--- a/utils/hhp2cached/hhp2cached.bkl
+++ b/utils/hhp2cached/hhp2cached.bkl
@@ -12,11 +12,10 @@
         <win32-res>hhp2cached.rc</win32-res>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
         <win32-res>hhp2cached.rc</win32-res>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>
         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>

-    
+

 <!--    <wx-data id="data">
         <files>
             test.zip
 <!--    <wx-data id="data">
         <files>
             test.zip

diff --git a/utils/tex2rtf/src/tex2rtf.bkl b/utils/tex2rtf/src/tex2rtf.bkl
index e433ca26c27dc745b4eb42e266af5e1ebe1dab00..582d493e0526fe437359b9f6ddc2f00d8a64b43e 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.bkl
+++ b/utils/tex2rtf/src/tex2rtf.bkl
@@ -24,13 +24,12 @@
         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>
         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>

-    
+

     <exe id="tex2rtf_gui" template="wx_util" template_append="wx_append"
          cond="USE_GUI=='1'">
         <sources>$(TEX2RTF_SRC)</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>
     <exe id="tex2rtf_gui" template="wx_util" template_append="wx_append"
          cond="USE_GUI=='1'">
         <sources>$(TEX2RTF_SRC)</sources>
         <wx-lib>html</wx-lib>
         <wx-lib>core</wx-lib>

-        <wx-lib>net</wx-lib>

         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>
         <wx-lib>base</wx-lib>
         <install-to>$(BINDIR)</install-to>
     </exe>