From 7e49601492345158938e6d64e8423e43fb77d94e Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 21 Dec 2004 17:20:47 +0000 Subject: [PATCH] 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 --- contrib/samples/gizmos/dynsash/dynsash.bkl | 1 - contrib/samples/ogl/studio/studio.bkl | 5 ++--- contrib/utils/wxrcedit/wxrcedit.bkl | 1 - demos/dbbrowse/dbbrowse.bkl | 1 - demos/forty/forty.bkl | 1 - demos/poem/poem.bkl | 3 +-- samples/help/help.bkl | 3 +-- samples/htlbox/htlbox.bkl | 1 - samples/html/about/about.bkl | 1 - samples/html/help/help.bkl | 1 - samples/html/helpview/helpview.bkl | 1 - samples/html/printing/printing.bkl | 1 - samples/html/virtual/virtual.bkl | 1 - samples/html/widget/widget.bkl | 1 - samples/html/zip/zip.bkl | 1 - samples/xrc/xrcdemo.bkl | 1 - src/html/winpars.cpp | 18 ++++++++---------- utils/configtool/src/configtool.bkl | 5 ++--- utils/hhp2cached/hhp2cached.bkl | 3 +-- utils/tex2rtf/src/tex2rtf.bkl | 3 +-- 20 files changed, 16 insertions(+), 37 deletions(-) diff --git a/contrib/samples/gizmos/dynsash/dynsash.bkl b/contrib/samples/gizmos/dynsash/dynsash.bkl index ab6cddf118..640ba00078 100644 --- a/contrib/samples/gizmos/dynsash/dynsash.bkl +++ b/contrib/samples/gizmos/dynsash/dynsash.bkl @@ -11,7 +11,6 @@ gizmos html core - net base diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl index 48a1737a63..da36eac77e 100644 --- a/contrib/samples/ogl/studio/studio.bkl +++ b/contrib/samples/ogl/studio/studio.bkl @@ -23,15 +23,14 @@ adv html core - net base studio.rc - + studio_resources.wxr - + diff --git a/contrib/utils/wxrcedit/wxrcedit.bkl b/contrib/utils/wxrcedit/wxrcedit.bkl index cd1d2f0572..804ac66a57 100644 --- a/contrib/utils/wxrcedit/wxrcedit.bkl +++ b/contrib/utils/wxrcedit/wxrcedit.bkl @@ -23,7 +23,6 @@ html core xml - net base wxrcedit.rc $(EXTRALIBS_XML) diff --git a/demos/dbbrowse/dbbrowse.bkl b/demos/dbbrowse/dbbrowse.bkl index 53ea35bf66..e00c06a951 100644 --- a/demos/dbbrowse/dbbrowse.bkl +++ b/demos/dbbrowse/dbbrowse.bkl @@ -19,7 +19,6 @@ odbc html core - net base dbbrowse.rc diff --git a/demos/forty/forty.bkl b/demos/forty/forty.bkl index cc5ac9a99a..3296588c40 100644 --- a/demos/forty/forty.bkl +++ b/demos/forty/forty.bkl @@ -17,7 +17,6 @@ html adv core - net base forty.rc diff --git a/demos/poem/poem.bkl b/demos/poem/poem.bkl index 8143cf0b69..d940be9258 100644 --- a/demos/poem/poem.bkl +++ b/demos/poem/poem.bkl @@ -7,11 +7,10 @@ wxpoem.cpp html core - net base wxpoem.rc - + wxpoem.txt wxpoem.dat diff --git a/samples/help/help.bkl b/samples/help/help.bkl index edb5d35d4d..2d0a70fb88 100644 --- a/samples/help/help.bkl +++ b/samples/help/help.bkl @@ -7,7 +7,6 @@ demo.cpp html core - net base demo.rc @@ -31,7 +30,7 @@ up.gif - + $(BUILDDIR)/doc $(SRCDIR)/doc diff --git a/samples/htlbox/htlbox.bkl b/samples/htlbox/htlbox.bkl index 5c417b995c..3105bc4d6b 100644 --- a/samples/htlbox/htlbox.bkl +++ b/samples/htlbox/htlbox.bkl @@ -7,7 +7,6 @@ htlbox.cpp html core - net base htlbox.rc diff --git a/samples/html/about/about.bkl b/samples/html/about/about.bkl index 11b5b7fff9..473530efee 100644 --- a/samples/html/about/about.bkl +++ b/samples/html/about/about.bkl @@ -9,7 +9,6 @@ about.cpp html core - net base about.rc diff --git a/samples/html/help/help.bkl b/samples/html/help/help.bkl index 771ea1978a..6bc0a74eb0 100644 --- a/samples/html/help/help.bkl +++ b/samples/html/help/help.bkl @@ -9,7 +9,6 @@ help.cpp html core - net base help.rc diff --git a/samples/html/helpview/helpview.bkl b/samples/html/helpview/helpview.bkl index 5edc6d4d36..a04699656e 100644 --- a/samples/html/helpview/helpview.bkl +++ b/samples/html/helpview/helpview.bkl @@ -9,7 +9,6 @@ helpview.cpp html core - net base helpview.rc diff --git a/samples/html/printing/printing.bkl b/samples/html/printing/printing.bkl index 5115f0f724..37e7f0ad19 100644 --- a/samples/html/printing/printing.bkl +++ b/samples/html/printing/printing.bkl @@ -9,7 +9,6 @@ printing.cpp html core - net base adv printing.rc diff --git a/samples/html/virtual/virtual.bkl b/samples/html/virtual/virtual.bkl index fc8ea5eca0..10c045e6a6 100644 --- a/samples/html/virtual/virtual.bkl +++ b/samples/html/virtual/virtual.bkl @@ -9,7 +9,6 @@ virtual.cpp html core - net base virtual.rc diff --git a/samples/html/widget/widget.bkl b/samples/html/widget/widget.bkl index bba4e6319d..82e8e709ca 100644 --- a/samples/html/widget/widget.bkl +++ b/samples/html/widget/widget.bkl @@ -9,7 +9,6 @@ widget.cpp html core - net base widget.rc diff --git a/samples/html/zip/zip.bkl b/samples/html/zip/zip.bkl index c5d40d2756..dbf4125afd 100644 --- a/samples/html/zip/zip.bkl +++ b/samples/html/zip/zip.bkl @@ -9,7 +9,6 @@ zip.cpp html core - net base zip.rc diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl index a2497944d4..0d008d4951 100644 --- a/samples/xrc/xrcdemo.bkl +++ b/samples/xrc/xrcdemo.bkl @@ -15,7 +15,6 @@ adv core xml - net base xrcdemo.rc diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index ff3f4ea0bd..2c20d8858f 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -257,36 +257,34 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, { wxString myfullurl(myurl); -#if wxUSE_URL // 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(); - 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 ); - myfullurl = path.BuildURI(); + myfullurl = path.BuildUnescapedURI(); } else { // ... or force such addition if not included already - if( !current.GetURL().Contains(basepath) ) + if( !current.GetPath().Contains(base.GetPath()) ) { 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); diff --git a/utils/configtool/src/configtool.bkl b/utils/configtool/src/configtool.bkl index fcc06aaa78..75ef873e9f 100644 --- a/utils/configtool/src/configtool.bkl +++ b/utils/configtool/src/configtool.bkl @@ -22,12 +22,11 @@ settingsdialog.cpp utils.cpp - + adv html core xml - net base @@ -36,5 +35,5 @@ $(SRCDIR)/../configs wxwin250.wxs - + diff --git a/utils/hhp2cached/hhp2cached.bkl b/utils/hhp2cached/hhp2cached.bkl index 5535d6a251..16d2e7a43c 100644 --- a/utils/hhp2cached/hhp2cached.bkl +++ b/utils/hhp2cached/hhp2cached.bkl @@ -12,11 +12,10 @@ hhp2cached.rc html core - net base $(BINDIR) - +