projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxUniv: implement wxSYS_VSCROLL_X/Y metrics in wxUniv code, they depend on the theme...
[wxWidgets.git]
/
include
/
wx
/
filesys.h
diff --git
a/include/wx/filesys.h
b/include/wx/filesys.h
index 69d4ffd284b6cfc4f5e67e511dd969d861a4565d..00214c18afb2aec63180071a0009d70178fd2fb0 100644
(file)
--- a/
include/wx/filesys.h
+++ b/
include/wx/filesys.h
@@
-27,9
+27,9
@@
#include "wx/filename.h"
#include "wx/hashmap.h"
#include "wx/filename.h"
#include "wx/hashmap.h"
-class WXDLLIMPEXP_BASE wxFSFile;
-class WXDLLIMPEXP_BASE wxFileSystemHandler;
-class WXDLLIMPEXP_BASE wxFileSystem;
+class WXDLLIMPEXP_
FWD_
BASE wxFSFile;
+class WXDLLIMPEXP_
FWD_
BASE wxFileSystemHandler;
+class WXDLLIMPEXP_
FWD_
BASE wxFileSystem;
//--------------------------------------------------------------------------------
// wxFSFile
//--------------------------------------------------------------------------------
// wxFSFile
@@
-50,7
+50,7
@@
public:
{
m_Stream = stream;
m_Location = loc;
{
m_Stream = stream;
m_Location = loc;
- m_MimeType = mimetype
; m_MimeType.Make
Lower();
+ m_MimeType = mimetype
.
Lower();
m_Anchor = anchor;
#if wxUSE_DATETIME
m_Modif = modif;
m_Anchor = anchor;
#if wxUSE_DATETIME
m_Modif = modif;
@@
-78,7
+78,7
@@
public:
}
// returns file's mime type
}
// returns file's mime type
- const wxString& GetMimeType() const
{ return m_MimeType; }
+ const wxString& GetMimeType() const
;
// returns the original location (aka filename) of the file
const wxString& GetLocation() const { return m_Location; }
// returns the original location (aka filename) of the file
const wxString& GetLocation() const { return m_Location; }
@@
-132,28
+132,28
@@
public:
virtual wxString FindFirst(const wxString& spec, int flags = 0);
virtual wxString FindNext();
virtual wxString FindFirst(const wxString& spec, int flags = 0);
virtual wxString FindNext();
+ // Returns MIME type of the file - w/o need to open it
+ // (default behaviour is that it returns type based on extension)
+ static wxString GetMimeTypeFromExt(const wxString& location);
+
protected:
// returns protocol ("file", "http", "tar" etc.) The last (most right)
// protocol is used:
// {it returns "tar" for "file:subdir/archive.tar.gz#tar:/README.txt"}
protected:
// returns protocol ("file", "http", "tar" etc.) The last (most right)
// protocol is used:
// {it returns "tar" for "file:subdir/archive.tar.gz#tar:/README.txt"}
-
wxString GetProtocol(const wxString& location) const
;
+
static wxString GetProtocol(const wxString& location)
;
// returns left part of address:
// {it returns "file:subdir/archive.tar.gz" for "file:subdir/archive.tar.gz#tar:/README.txt"}
// returns left part of address:
// {it returns "file:subdir/archive.tar.gz" for "file:subdir/archive.tar.gz#tar:/README.txt"}
-
wxString GetLeftLocation(const wxString& location) const
;
+
static wxString GetLeftLocation(const wxString& location)
;
// returns anchor part of address:
// {it returns "anchor" for "file:subdir/archive.tar.gz#tar:/README.txt#anchor"}
// NOTE: anchor is NOT a part of GetLeftLocation()'s return value
// returns anchor part of address:
// {it returns "anchor" for "file:subdir/archive.tar.gz#tar:/README.txt#anchor"}
// NOTE: anchor is NOT a part of GetLeftLocation()'s return value
-
wxString GetAnchor(const wxString& location) const
;
+
static wxString GetAnchor(const wxString& location)
;
// returns right part of address:
// {it returns "/README.txt" for "file:subdir/archive.tar.gz#tar:/README.txt"}
// returns right part of address:
// {it returns "/README.txt" for "file:subdir/archive.tar.gz#tar:/README.txt"}
- wxString GetRightLocation(const wxString& location) const;
-
- // Returns MIME type of the file - w/o need to open it
- // (default behaviour is that it returns type based on extension)
- wxString GetMimeTypeFromExt(const wxString& location);
+ static wxString GetRightLocation(const wxString& location);
DECLARE_ABSTRACT_CLASS(wxFileSystemHandler)
};
DECLARE_ABSTRACT_CLASS(wxFileSystemHandler)
};
@@
-168,7
+168,8
@@
protected:
//--------------------------------------------------------------------------------
// Open Bit Flags
//--------------------------------------------------------------------------------
// Open Bit Flags
-enum {
+enum wxFileSystemOpenFlags
+{
wxFS_READ = 1, // Open for reading
wxFS_SEEKABLE = 4 // Returned stream will be seekable
};
wxFS_READ = 1, // Open for reading
wxFS_SEEKABLE = 4 // Returned stream will be seekable
};
@@
-205,7
+206,8
@@
public:
wxString FindNext();
// find a file in a list of directories, returns false if not found
wxString FindNext();
// find a file in a list of directories, returns false if not found
- bool FindFileInPath(wxString *pStr, const wxChar *path, const wxChar *file);
+ bool FindFileInPath(wxString *pStr,
+ const wxString& path, const wxString& file);
// Adds FS handler.
// In fact, this class is only front-end to the FS handlers :-)
// Adds FS handler.
// In fact, this class is only front-end to the FS handlers :-)