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

moved wxURL::ConvertToValidURI() and other methods from uri.cpp to url.cpp so that they're exported from net DLL as needed (patch 1233765)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-07-28 21:52:50 +00:00
parent 6984e41478
commit 97d8fe8791
2 changed files with 80 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/common/uri.cpp
View File

@@ -1289,90 +1289,6 @@ bool wxURI::IsDigit(const wxChar& c)
{ return c >= wxT('0') && c <= wxT('9'); } { return c >= wxT('0') && c <= wxT('9'); }
// ---------------------------------------------------------------------------
//
// wxURL Compatibility
//
// ---------------------------------------------------------------------------
#if wxUSE_URL
#if WXWIN_COMPATIBILITY_2_4
#include "wx/url.h"
wxString wxURL::GetProtocolName() const
{
return m_scheme;
}
wxString wxURL::GetHostName() const
{
return m_server;
}
wxString wxURL::GetPath() const
{
return m_path;
}
//Note that this old code really doesn't convert to a URI that well and looks
//more like a dirty hack than anything else...
wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims)
{
wxString out_str;
wxString hexa_code;
size_t i;
for (i = 0; i < uri.Len(); i++)
{
wxChar c = uri.GetChar(i);
if (c == wxT(' '))
{
// GRG, Apr/2000: changed to "%20" instead of '+'
out_str += wxT("%20");
}
else
{
// GRG, Apr/2000: modified according to the URI definition (RFC 2396)
//
// - Alphanumeric characters are never escaped
// - Unreserved marks are never escaped
// - Delimiters must be escaped if they appear within a component
// but not if they are used to separate components. Here we have
// no clear way to distinguish between these two cases, so they
// are escaped unless they are passed in the 'delims' parameter
// (allowed delimiters).
static const wxChar marks[] = wxT("-_.!~*()'");
if ( !wxIsalnum(c) && !wxStrchr(marks, c) && !wxStrchr(delims, c) )
{
hexa_code.Printf(wxT("%%%02X"), c);
out_str += hexa_code;
}
else
{
out_str += c;
}
}
}
return out_str;
}
wxString wxURL::ConvertFromURI(const wxString& uri)
{
return wxURI::Unescape(uri);
}
#endif //WXWIN_COMPATIBILITY_2_4
#endif //wxUSE_URL
//end of uri.cpp //end of uri.cpp

80
src/common/url.cpp
View File

@@ -440,4 +440,84 @@ void wxURLModule::OnExit()
#endif // wxUSE_SOCKETS #endif // wxUSE_SOCKETS
// ---------------------------------------------------------------------------
//
// wxURL Compatibility
//
// ---------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY_2_4
#include "wx/url.h"
wxString wxURL::GetProtocolName() const
{
return m_scheme;
}
wxString wxURL::GetHostName() const
{
return m_server;
}
wxString wxURL::GetPath() const
{
return m_path;
}
//Note that this old code really doesn't convert to a URI that well and looks
//more like a dirty hack than anything else...
wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims)
{
wxString out_str;
wxString hexa_code;
size_t i;
for (i = 0; i < uri.Len(); i++)
{
wxChar c = uri.GetChar(i);
if (c == wxT(' '))
{
// GRG, Apr/2000: changed to "%20" instead of '+'
out_str += wxT("%20");
}
else
{
// GRG, Apr/2000: modified according to the URI definition (RFC 2396)
//
// - Alphanumeric characters are never escaped
// - Unreserved marks are never escaped
// - Delimiters must be escaped if they appear within a component
// but not if they are used to separate components. Here we have
// no clear way to distinguish between these two cases, so they
// are escaped unless they are passed in the 'delims' parameter
// (allowed delimiters).
static const wxChar marks[] = wxT("-_.!~*()'");
if ( !wxIsalnum(c) && !wxStrchr(marks, c) && !wxStrchr(delims, c) )
{
hexa_code.Printf(wxT("%%%02X"), c);
out_str += hexa_code;
}
else
{
out_str += c;
}
}
}
return out_str;
}
wxString wxURL::ConvertFromURI(const wxString& uri)
{
return wxURI::Unescape(uri);
}
#endif //WXWIN_COMPATIBILITY_2_4
#endif // wxUSE_URL #endif // wxUSE_URL