projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use 'I' cursor when over text
[wxWidgets.git]
/
include
/
wx
/
filesys.h
diff --git
a/include/wx/filesys.h
b/include/wx/filesys.h
index 06ca7ca97c191c54e29d50e2fd4bae7afbd428b5..5c69a5da7c46468a90040fe5230a7671cca0465d 100644
(file)
--- a/
include/wx/filesys.h
+++ b/
include/wx/filesys.h
@@
-10,8
+10,8
@@
#ifndef __FILESYS_H__
#define __FILESYS_H__
#ifndef __FILESYS_H__
#define __FILESYS_H__
-#if
def __GNUG__
-#pragma interface
+#if
defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface
"filesys.h"
#endif
#include "wx/setup.h"
#endif
#include "wx/setup.h"
@@
-29,6
+29,7
@@
#include "wx/stream.h"
#include "wx/url.h"
#include "wx/datetime.h"
#include "wx/stream.h"
#include "wx/url.h"
#include "wx/datetime.h"
+#include "wx/filename.h"
class wxFSFile;
class wxFileSystemHandler;
class wxFSFile;
class wxFileSystemHandler;
@@
-45,15
+46,21
@@
class WXDLLEXPORT wxFSFile : public wxObject
{
public:
wxFSFile(wxInputStream *stream, const wxString& loc,
{
public:
wxFSFile(wxInputStream *stream, const wxString& loc,
- const wxString& mimetype, const wxString& anchor,
- wxDateTime modif)
+ const wxString& mimetype, const wxString& anchor
+#if wxUSE_DATETIME
+ , wxDateTime modif
+#endif // wxUSE_DATETIME
+ )
{
m_Stream = stream;
m_Location = loc;
m_MimeType = mimetype; m_MimeType.MakeLower();
m_Anchor = anchor;
{
m_Stream = stream;
m_Location = loc;
m_MimeType = mimetype; m_MimeType.MakeLower();
m_Anchor = anchor;
+#if wxUSE_DATETIME
m_Modif = modif;
m_Modif = modif;
+#endif // wxUSE_DATETIME
}
}
+
virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
// returns stream. This doesn't _create_ stream, it only returns
virtual ~wxFSFile() { if (m_Stream) delete m_Stream; }
// returns stream. This doesn't _create_ stream, it only returns
@@
-68,16
+75,21
@@
public:
const wxString& GetAnchor() const {return m_Anchor;}
const wxString& GetAnchor() const {return m_Anchor;}
+#if wxUSE_DATETIME
wxDateTime GetModificationTime() const {return m_Modif;}
wxDateTime GetModificationTime() const {return m_Modif;}
+#endif // wxUSE_DATETIME
private:
wxInputStream *m_Stream;
wxString m_Location;
wxString m_MimeType;
wxString m_Anchor;
private:
wxInputStream *m_Stream;
wxString m_Location;
wxString m_MimeType;
wxString m_Anchor;
+#if wxUSE_DATETIME
wxDateTime m_Modif;
wxDateTime m_Modif;
+#endif // wxUSE_DATETIME
DECLARE_ABSTRACT_CLASS(wxFSFile)
DECLARE_ABSTRACT_CLASS(wxFSFile)
+ DECLARE_NO_COPY_CLASS(wxFSFile)
};
};
@@
-180,6
+192,13
@@
public:
// remove all items from the m_Handlers list
static void CleanUpHandlers();
// remove all items from the m_Handlers list
static void CleanUpHandlers();
+ // Returns the native path for a file URL
+ static wxFileName URLToFileName(const wxString& url);
+
+ // Returns the file URL for a native path
+ static wxString FileNameToURL(const wxFileName& filename);
+
+
protected:
wxString m_Path;
// the path (location) we are currently in
protected:
wxString m_Path;
// the path (location) we are currently in
@@
-194,6
+213,7
@@
protected:
// handler that succeed in FindFirst query
DECLARE_DYNAMIC_CLASS(wxFileSystem)
// handler that succeed in FindFirst query
DECLARE_DYNAMIC_CLASS(wxFileSystem)
+ DECLARE_NO_COPY_CLASS(wxFileSystem)
};
};
@@
-221,7
+241,7
@@
special characters :
*/
*/
-class wxLocalFSHandler : public wxFileSystemHandler
+class
WXDLLEXPORT
wxLocalFSHandler : public wxFileSystemHandler
{
public:
virtual bool CanOpen(const wxString& location);
{
public:
virtual bool CanOpen(const wxString& location);