added wxRegEx::GetMatchCount (patch 938995)

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

diff --git a/include/wx/ffile.h b/include/wx/ffile.h
index a5eaed10603c711fbca3ccf0cf60108e5e5d5afd..8f8ffde0147c4677b2509b9a7f3d7a3f33b3a800 100644 (file)
--- a/include/wx/ffile.h
+++ b/include/wx/ffile.h
@@ -12,7 +12,7 @@
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 
 #ifndef   _WX_FFILE_H_
 #define   _WX_FFILE_H_
 

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

     #pragma interface "ffile.h"
 #endif
 
     #pragma interface "ffile.h"
 #endif
 


@@ -34,7 +34,7 @@
 //     dtor which is _not_ virtual, so it shouldn't be used as a base class.
 // ----------------------------------------------------------------------------
 
 //     dtor which is _not_ virtual, so it shouldn't be used as a base class.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxFFile
+class WXDLLIMPEXP_BASE wxFFile

 {
 public:
   // ctors
 {
 public:
   // ctors


@@ -53,7 +53,7 @@ public:
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object
   bool Close();
 
   // assign an existing file descriptor and get it back from wxFFile object

-  void Attach(FILE *fp, const wxString& name = wxT(""))
+  void Attach(FILE *fp, const wxString& name = wxEmptyString)

     { Close(); m_fp = fp; m_name = name; }
   void Detach() { m_fp = NULL; }
   FILE *fp() const { return m_fp; }
     { Close(); m_fp = fp; m_name = name; }
   void Detach() { m_fp = NULL; }
   FILE *fp() const { return m_fp; }


@@ -86,7 +86,8 @@ public:
     // get current file length
   size_t Length() const;
 
     // get current file length
   size_t Length() const;
 

-  // simple accessors
+  // simple accessors: note that Eof() and Error() may only be called if
+  // IsOpened()!

     // is file opened?
   bool IsOpened() const { return m_fp != NULL; }
     // is end of file reached?
     // is file opened?
   bool IsOpened() const { return m_fp != NULL; }
     // is end of file reached?