Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxURI is enough for the basic url operations.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-21 17:20:47 +00:00
parent 1296186133
commit 7e49601492
20 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/samples/gizmos/dynsash/dynsash.bkl
View File

@@ -11,7 +11,6 @@
<wx-lib>gizmos</wx-lib> <wx-lib>gizmos</wx-lib>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
</exe> </exe>

5
contrib/samples/ogl/studio/studio.bkl
View File

@@ -23,15 +23,14 @@
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>studio.rc</win32-res> <win32-res>studio.rc</win32-res>
</exe> </exe>
<wx-data id="data"> <wx-data id="data">
<files> <files>
studio_resources.wxr studio_resources.wxr
</files> </files>
</wx-data> </wx-data>
</makefile> </makefile>

1
contrib/utils/wxrcedit/wxrcedit.bkl
View File

@@ -23,7 +23,6 @@
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>xml</wx-lib> <wx-lib>xml</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>wxrcedit.rc</win32-res> <win32-res>wxrcedit.rc</win32-res>
<ldlibs>$(EXTRALIBS_XML)</ldlibs> <ldlibs>$(EXTRALIBS_XML)</ldlibs>

1
demos/dbbrowse/dbbrowse.bkl
View File

@@ -19,7 +19,6 @@
<wx-lib>odbc</wx-lib> <wx-lib>odbc</wx-lib>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>dbbrowse.rc</win32-res> <win32-res>dbbrowse.rc</win32-res>
</exe> </exe>

1
demos/forty/forty.bkl
View File

@@ -17,7 +17,6 @@
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>forty.rc</win32-res> <win32-res>forty.rc</win32-res>
</exe> </exe>

3
demos/poem/poem.bkl
View File

@@ -7,11 +7,10 @@
<sources>wxpoem.cpp</sources> <sources>wxpoem.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>wxpoem.rc</win32-res> <win32-res>wxpoem.rc</win32-res>
</exe> </exe>
<wx-data id="data"> <wx-data id="data">
<files> <files>
wxpoem.txt wxpoem.dat wxpoem.txt wxpoem.dat

3
samples/help/help.bkl
View File

@@ -7,7 +7,6 @@
<sources>demo.cpp</sources> <sources>demo.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>demo.rc</win32-res> <win32-res>demo.rc</win32-res>
</exe> </exe>
@@ -31,7 +30,7 @@
up.gif up.gif
</files> </files>
</wx-data> </wx-data>
<wx-data id="data_doc"> <wx-data id="data_doc">
<dstdir>$(BUILDDIR)/doc</dstdir> <dstdir>$(BUILDDIR)/doc</dstdir>
<srcdir>$(SRCDIR)/doc</srcdir> <srcdir>$(SRCDIR)/doc</srcdir>

1
samples/htlbox/htlbox.bkl
View File

@@ -7,7 +7,6 @@
<sources>htlbox.cpp</sources> <sources>htlbox.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>htlbox.rc</win32-res> <win32-res>htlbox.rc</win32-res>
</exe> </exe>

1
samples/html/about/about.bkl
View File

@@ -9,7 +9,6 @@
<sources>about.cpp</sources> <sources>about.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>about.rc</win32-res> <win32-res>about.rc</win32-res>
</exe> </exe>

1
samples/html/help/help.bkl
View File

@@ -9,7 +9,6 @@
<sources>help.cpp</sources> <sources>help.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>help.rc</win32-res> <win32-res>help.rc</win32-res>
</exe> </exe>

1
samples/html/helpview/helpview.bkl
View File

@@ -9,7 +9,6 @@
<sources>helpview.cpp</sources> <sources>helpview.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>helpview.rc</win32-res> <win32-res>helpview.rc</win32-res>
</exe> </exe>

1
samples/html/printing/printing.bkl
View File

@@ -9,7 +9,6 @@
<sources>printing.cpp</sources> <sources>printing.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<win32-res>printing.rc</win32-res> <win32-res>printing.rc</win32-res>

1
samples/html/virtual/virtual.bkl
View File

@@ -9,7 +9,6 @@
<sources>virtual.cpp</sources> <sources>virtual.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>virtual.rc</win32-res> <win32-res>virtual.rc</win32-res>
</exe> </exe>

1
samples/html/widget/widget.bkl
View File

@@ -9,7 +9,6 @@
<sources>widget.cpp</sources> <sources>widget.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>widget.rc</win32-res> <win32-res>widget.rc</win32-res>
</exe> </exe>

1
samples/html/zip/zip.bkl
View File

@@ -9,7 +9,6 @@
<sources>zip.cpp</sources> <sources>zip.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>zip.rc</win32-res> <win32-res>zip.rc</win32-res>
</exe> </exe>

1
samples/xrc/xrcdemo.bkl
View File

@@ -15,7 +15,6 @@
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>xml</wx-lib> <wx-lib>xml</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>xrcdemo.rc</win32-res> <win32-res>xrcdemo.rc</win32-res>
</exe> </exe>

18
src/html/winpars.cpp
View File

@@ -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)); wxURI current(myurl);
myfullurl = current.GetURL(); myfullurl = current.BuildUnescapedURI();
// if not absolute then ... // if not absolute then ...
if( current.IsReference() ) if( current.IsReference() )
{ {
wxString basepath = GetFS()->GetPath(); 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() ) if( !base.IsReference() )
{ {
wxURI path(myfullurl); wxURI path(myfullurl);
path.Resolve( base ); path.Resolve( base );
myfullurl = path.BuildURI(); myfullurl = path.BuildUnescapedURI();
} }
else else
{ {
// ... or force such addition if not included already // ... 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) ); wxURI connected( basepath );
myfullurl = connected.GetURL(); myfullurl = connected.BuildUnescapedURI();
} }
} }
} }
#endif
wxString redirect; wxString redirect;
status = m_Window->OnOpeningURL(type, myfullurl, &redirect); status = m_Window->OnOpeningURL(type, myfullurl, &redirect);

5
utils/configtool/src/configtool.bkl
View File

@@ -22,12 +22,11 @@
settingsdialog.cpp settingsdialog.cpp
utils.cpp utils.cpp
</sources> </sources>
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>xml</wx-lib> <wx-lib>xml</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
</exe> </exe>
@@ -36,5 +35,5 @@
<srcdir>$(SRCDIR)/../configs</srcdir> <srcdir>$(SRCDIR)/../configs</srcdir>
<files>wxwin250.wxs</files> <files>wxwin250.wxs</files>
</wx-data> </wx-data>
</makefile> </makefile>

3
utils/hhp2cached/hhp2cached.bkl
View File

@@ -12,11 +12,10 @@
<win32-res>hhp2cached.rc</win32-res> <win32-res>hhp2cached.rc</win32-res>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<install-to>$(BINDIR)</install-to> <install-to>$(BINDIR)</install-to>
</exe> </exe>
<!-- <wx-data id="data"> <!-- <wx-data id="data">
<files> <files>
test.zip test.zip

3
utils/tex2rtf/src/tex2rtf.bkl
View File

@@ -24,13 +24,12 @@
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<install-to>$(BINDIR)</install-to> <install-to>$(BINDIR)</install-to>
</exe> </exe>
<exe id="tex2rtf_gui" template="wx_util" template_append="wx_append" <exe id="tex2rtf_gui" template="wx_util" template_append="wx_append"
cond="USE_GUI=='1'"> cond="USE_GUI=='1'">
<sources>$(TEX2RTF_SRC)</sources> <sources>$(TEX2RTF_SRC)</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>net</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<install-to>$(BINDIR)</install-to> <install-to>$(BINDIR)</install-to>
</exe> </exe>