// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// CVS-ID: $Id$
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
{
wxString ext, mime;
wxString loc = GetRightLocation(location);
- char c;
+ wxChar c;
int l = loc.Length(), l2;
l2 = l;
static const wxFileTypeInfo fallbacks[] =
{
wxFileTypeInfo(_T("image/jpeg"),
- _T(""),
- _T(""),
+ wxEmptyString,
+ wxEmptyString,
_T("JPEG image (from fallback)"),
_T("jpg"), _T("jpeg"), _T("JPG"), _T("JPEG"), NULL),
wxFileTypeInfo(_T("image/gif"),
- _T(""),
- _T(""),
+ wxEmptyString,
+ wxEmptyString,
_T("GIF image (from fallback)"),
_T("gif"), _T("GIF"), NULL),
wxFileTypeInfo(_T("image/png"),
- _T(""),
- _T(""),
+ wxEmptyString,
+ wxEmptyString,
_T("PNG image (from fallback)"),
_T("png"), _T("PNG"), NULL),
wxFileTypeInfo(_T("image/bmp"),
- _T(""),
- _T(""),
+ wxEmptyString,
+ wxEmptyString,
_T("windows bitmap image (from fallback)"),
_T("bmp"), _T("BMP"), NULL),
wxFileTypeInfo(_T("text/html"),
- _T(""),
- _T(""),
+ wxEmptyString,
+ wxEmptyString,
_T("HTML document (from fallback)"),
_T("htm"), _T("html"), _T("HTM"), _T("HTML"), NULL),
// must terminate the table with this!
return mime;
#else
- if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) )
+ if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
return wxT("text/html");
- if ( ext.IsSameAs(wxT("jpg"), FALSE) || ext.IsSameAs(_T("jpeg"), FALSE) )
+ if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
return wxT("image/jpeg");
- if ( ext.IsSameAs(wxT("gif"), FALSE) )
+ if ( ext.IsSameAs(wxT("gif"), false) )
return wxT("image/gif");
- if ( ext.IsSameAs(wxT("png"), FALSE) )
+ if ( ext.IsSameAs(wxT("png"), false) )
return wxT("image/png");
- if ( ext.IsSameAs(wxT("bmp"), FALSE) )
+ if ( ext.IsSameAs(wxT("bmp"), false) )
return wxT("image/bmp");
return wxEmptyString;
#endif
{
wxString s = wxEmptyString;
int i, l = location.Length();
- bool fnd;
+ bool fnd = false;
- fnd = FALSE;
for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
- if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+ if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
}
if (!fnd) return wxT("file");
for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
{
int i;
- bool fnd;
+ bool fnd = false;
- fnd = FALSE;
for (i = location.Length()-1; i >= 0; i--) {
- if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
+ if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
}
return wxEmptyString;
int i, l = location.Length();
int l2 = l + 1;
- for (i = l-1;
- (i >= 0) &&
- ((location[i] != wxT(':')) || (i == 1) ||
- (location[i-2] == wxT(':'))
-#ifdef __WXMSW__
- || ((i > 3) && location[i-4] == wxT(':')) // E.g. file://C:/thing.jpg
-#endif
- );
+ for (i = l-1;
+ (i >= 0) &&
+ ((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
i--)
{
if (location[i] == wxT('#')) l2 = i + 1;
}
-#ifdef __WXMSW__
- // We may now have //c:/thing.jpg
- if (((i + 4) < l) && location[i+1] == wxT('/') && location[i+2] == wxT('/') &&
- location[i+4] == wxT(':'))
- {
- i = i + 2;
- }
-#endif
if (i == 0) return wxEmptyString;
else return location.Mid(i + 1, l2 - i - 2);
}
wxString wxFileSystemHandler::GetAnchor(const wxString& location) const
{
- char c;
+ wxChar c;
int l = location.Length();
for (int i = l-1; i >= 0; i--) {
{
wxString loc = MakeCorrectPath(location);
unsigned i, ln;
- char meta;
+ wxChar meta;
wxFSFile *s = NULL;
wxList::compatibility_iterator node;
WX_CLEAR_LIST(wxList, m_Handlers);
}
-const static wxString g_unixPathString(wxT("/"));
-const static wxString g_nativePathString(wxFILE_SEP_PATH);
+static const wxString g_unixPathString(wxT("/"));
+static const wxString g_nativePathString(wxFILE_SEP_PATH);
// Returns the native path for a file URL
wxFileName wxFileSystem::URLToFileName(const wxString& url)
{
- wxString path = url;
+ wxString path = url;
- if ( path.Find(wxT("file://")) == 0 )
- {
- path = path.Mid(7);
- }
+ if ( path.Find(wxT("file://")) == 0 )
+ {
+ path = path.Mid(7);
+ }
else if ( path.Find(wxT("file:")) == 0 )
- {
- path = path.Mid(5);
- }
- // Remove preceding double slash on Mac Classic
+ {
+ path = path.Mid(5);
+ }
+ // Remove preceding double slash on Mac Classic
#if defined(__WXMAC__) && !defined(__UNIX__)
else if ( path.Find(wxT("//")) == 0 )
path = path.Mid(2);
#endif
-
+
path.Replace(wxT("%25"), wxT("%"));
path.Replace(wxT("%3A"), wxT(":"));
#ifdef __WXMSW__
- // file urls either start with a forward slash (local harddisk),
+ // file urls either start with a forward slash (local harddisk),
// otherwise they have a servername/sharename notation,
// which only exists on msw and corresponds to a unc
- if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
- {
- path = path.Mid(1);
- }
- else if ( (url.Find(wxT("file://")) == 0) &&
+ if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
+ {
+ path = path.Mid(1);
+ }
+ else if ( (url.Find(wxT("file://")) == 0) &&
(path.Find(wxT('/')) != wxNOT_FOUND) &&
(path.Length() > 1) && (path[1u] != wxT(':')) )
- {
- path = wxT("//") + path;
- }
+ {
+ path = wxT("//") + path;
+ }
#endif
- path.Replace(g_unixPathString, g_nativePathString);
+ path.Replace(g_unixPathString, g_nativePathString);
- return wxFileName(path, wxPATH_NATIVE);
+ return wxFileName(path, wxPATH_NATIVE);
}
// Returns the file URL for a native path
#ifndef __UNIX__
// unc notation, wxMSW
- if ( url.Find(wxT("\\\\")) == 0 )
+ if ( url.Find(wxT("\\\\")) == 0 )
{
- url = url.Mid(2);
+ url = wxT("//") + url.Mid(2);
}
else
{
projects / wxWidgets.git / blobdiff