Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index f7147901859674b4334ec00ab0a4b63cd0fc446e..a75350f72406d0efa5ccdcdbb9b826ee888b535d 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


@@ -108,7 +107,7 @@ 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.


@@ -166,10 +165,10 @@ public:
     // 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;}