NEED_GTK_ICON_SIZE_LOOKUP was incorrectly tested using #if instead of #ifdef

[wxWidgets.git] / include / wx / filesys.h

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index 7c1b69e77f77a51abcced4541856e5ab6be91090..99dba2e96c2de6527b71b6d4df14e207a9203792 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -4,17 +4,17 @@
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // RCS-ID:      $Id$

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FILESYS_H__
 #define __FILESYS_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "filesys.h"
 #endif
 
 #pragma interface "filesys.h"
 #endif
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if !wxUSE_STREAMS
 #error You cannot compile virtual file systems without wxUSE_STREAMS
 
 #if !wxUSE_STREAMS
 #error You cannot compile virtual file systems without wxUSE_STREAMS


@@ -27,13 +27,12 @@
 #if wxUSE_FILESYSTEM
 
 #include "wx/stream.h"
 #if wxUSE_FILESYSTEM
 
 #include "wx/stream.h"

-#include "wx/url.h"

 #include "wx/datetime.h"
 #include "wx/filename.h"
 
 #include "wx/datetime.h"
 #include "wx/filename.h"
 

-class wxFSFile;
-class wxFileSystemHandler;
-class wxFileSystem;
+class WXDLLIMPEXP_BASE wxFSFile;
+class WXDLLIMPEXP_BASE wxFileSystemHandler;
+class WXDLLIMPEXP_BASE wxFileSystem;

 
 //--------------------------------------------------------------------------------
 // wxFSFile
 
 //--------------------------------------------------------------------------------
 // wxFSFile


@@ -42,7 +41,7 @@ class wxFileSystem;
 //                  (in 'index.htm#chapter2', 'chapter2' is anchor)
 //--------------------------------------------------------------------------------
 
 //                  (in 'index.htm#chapter2', 'chapter2' is anchor)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFSFile : public wxObject
+class WXDLLIMPEXP_BASE wxFSFile : public wxObject

 {
 public:
     wxFSFile(wxInputStream *stream, const wxString& loc,
 {
 public:
     wxFSFile(wxInputStream *stream, const wxString& loc,


@@ -64,7 +63,7 @@ public:
     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

-    // pointer to it!!
+    // pointer to it.

     wxInputStream *GetStream() const {return m_Stream;}
 
     // returns file's mime type
     wxInputStream *GetStream() const {return m_Stream;}
 
     // returns file's mime type


@@ -103,12 +102,12 @@ private:
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileSystemHandler : public wxObject
+class WXDLLIMPEXP_BASE wxFileSystemHandler : public wxObject

 {
 public:
     wxFileSystemHandler() : wxObject() {}
 
 {
 public:
     wxFileSystemHandler() : wxObject() {}
 

-    // returns TRUE if this handler is able to open given location
+    // returns true if this handler is able to open given location

     virtual bool CanOpen(const wxString& location) = 0;
 
     // opens given file and returns pointer to input stream.
     virtual bool CanOpen(const wxString& location) = 0;
 
     // opens given file and returns pointer to input stream.


@@ -157,18 +156,19 @@ protected:
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 
 //                  kinds of files (HTPP, FTP, local, tar.gz etc..)
 //--------------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFileSystem : public wxObject
+class WXDLLIMPEXP_BASE wxFileSystem : public wxObject

 {
 public:
 {
 public:

-    wxFileSystem() : wxObject() {m_Path = m_LastName = wxEmptyString; m_Handlers.DeleteContents(TRUE); m_FindFileHandler = NULL;}
+    wxFileSystem() : wxObject() { m_FindFileHandler = NULL;}
+    virtual ~wxFileSystem() { }

 
     // sets the current location. Every call to OpenFile is
     // relative to this location.
     // NOTE !!
 
     // sets the current location. Every call to OpenFile is
     // relative to this location.
     // NOTE !!

-    // unless is_dir = TRUE 'location' is *not* the directory but
+    // unless is_dir = true 'location' is *not* the directory but

     // file contained in this directory
     // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")
     // file contained in this directory
     // (so ChangePathTo("dir/subdir/xh.htm") sets m_Path to "dir/subdir/")

-    void ChangePathTo(const wxString& location, bool is_dir = FALSE);
+    void ChangePathTo(const wxString& location, bool is_dir = false);

 
     wxString GetPath() const {return m_Path;}
 
 
     wxString GetPath() const {return m_Path;}
 


@@ -186,7 +186,7 @@ public:
     wxString FindNext();
 
     // Adds FS handler.
     wxString FindNext();
 
     // Adds FS handler.

-    // In fact, this class is only front-end to the FS hanlers :-)
+    // In fact, this class is only front-end to the FS handlers :-)

     static void AddHandler(wxFileSystemHandler *handler);
 
     // remove all items from the m_Handlers list
     static void AddHandler(wxFileSystemHandler *handler);
 
     // remove all items from the m_Handlers list


@@ -241,7 +241,7 @@ special characters :
 */
 
 
 */
 
 

-class wxLocalFSHandler : public wxFileSystemHandler
+class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler

 {
 public:
     virtual bool CanOpen(const wxString& location);
 {
 public:
     virtual bool CanOpen(const wxString& location);