common constants (wxSeekMode) and types (off_t) to wxFile and wxStream are

now defined in filefn.h included by both file.h and stream.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/file.h b/include/wx/file.h
index e3f8ab1fc3b0667400606bef86198a3bb518fdc2..fc1e0a5f174816f6aebbc075662d8a3cbcfbebbe 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -17,20 +17,8 @@
 #pragma interface "file.h"
 #endif
 
 #pragma interface "file.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-

 #include  "wx/string.h"
 #include  "wx/filefn.h"
 #include  "wx/string.h"
 #include  "wx/filefn.h"

-#include  "wx/stream.h" // for wxSeekMode
-
-// define off_t
-#include  <sys/types.h>
-
-#ifdef    _MSC_VER
-  #define   off_t       _off_t
-#endif

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -85,7 +73,7 @@ public:
     // returns true on success
   uint Write(const void *pBuf, uint nCount);
     // returns true on success
     // returns true on success
   uint Write(const void *pBuf, uint nCount);
     // returns true on success

-  bool Write(const wxString& str) { return Write(str.c_str(), str.Len()); }
+  bool Write(const wxString& s) { return Write(s.c_str(), s.Len()) != 0; }

     // flush data not yet written
   bool Flush();
 
     // flush data not yet written
   bool Flush();
 


@@ -144,8 +132,8 @@ public:
   bool IsOpened() const { return m_file.IsOpened(); }
 
   // I/O (both functions return true on success, false on failure)
   bool IsOpened() const { return m_file.IsOpened(); }
 
   // I/O (both functions return true on success, false on failure)

-  bool Write(const void *p, uint n) { return m_file.Write(p, n); }
-  bool Write(const wxString& str)   { return m_file.Write(str);  }
+  bool Write(const void *p, uint n) { return m_file.Write(p, n) != 0; }
+  bool Write(const wxString& str)   { return m_file.Write(str); }

 
   // different ways to close the file
     // validate changes and delete the old file of name m_strName
 
   // different ways to close the file
     // validate changes and delete the old file of name m_strName


@@ -163,4 +151,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-       // __FILEH__
+        // __FILEH__

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index e0ad458fb54408f08077ce3ce7a02c2170231bde..720beb4bf28f1cf48103cdfcd07cc6d477d69e76 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   __FILEFNH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef   __FILEFNH__


@@ -16,8 +16,26 @@
 #pragma interface "filefn.h"
 #endif
 
 #pragma interface "filefn.h"
 #endif
 

-#include "wx/list.h"
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 

+// define off_t
+#include  <sys/types.h>
+
+#ifdef    _MSC_VER
+  #define   off_t       _off_t
+#endif
+
+typedef enum {
+  wxFromStart,
+  wxFromCurrent,
+  wxFromEnd
+} wxSeekMode;
+
+// ----------------------------------------------------------------------------
+// functions
+// ----------------------------------------------------------------------------

 bool WXDLLEXPORT wxFileExists(const wxString& filename);
 #define FileExists wxFileExists
 
 bool WXDLLEXPORT wxFileExists(const wxString& filename);
 #define FileExists wxFileExists
 


@@ -158,6 +176,10 @@ void WXDLLEXPORT wxSplitPath(const char *pszFileName,
 // find a file in a list of directories, returns false if not found
 bool WXDLLEXPORT wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile);
 
 // find a file in a list of directories, returns false if not found
 bool WXDLLEXPORT wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile);
 

+// ----------------------------------------------------------------------------
+// classes
+// ----------------------------------------------------------------------------
+

 // Path searching
 class WXDLLEXPORT wxPathList: public wxStringList
 {
 // Path searching
 class WXDLLEXPORT wxPathList: public wxStringList
 {

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 692d522305a6b3b30a8489b52418abce253431ef..d22e9c0f9e83a8d778072d4fb33c38758e5c0bee 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -17,21 +17,13 @@
 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

-#include <wx/object.h>
-#include <wx/string.h>
-
-#ifdef    _MSC_VER
-  #define   off_t       _off_t
-#endif
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/filefn.h"  // for off_t and wxSeekMode

 
 /*
  * wxStream: base classes
  */
 
 /*
  * wxStream: base classes
  */

-
-typedef enum {
-  wxFromStart, wxFromCurrent, wxFromEnd
-} wxSeekMode;
-

 class wxOutputStream;
 class wxInputStream: virtual public wxObject {
   DECLARE_ABSTRACT_CLASS(wxInputStream)
 class wxOutputStream;
 class wxInputStream: virtual public wxObject {
   DECLARE_ABSTRACT_CLASS(wxInputStream)