* New wxStream classes: wxStreamBuffer and wxObject*Stream.

* Changes: ofsInvalid => wxInvalidOffset in filefn.h
* Updates: all wxStream classes use wxStreamBuffer.
           wxObject basic declaration changes (added LoadObject, modified
           StoreObject)
* Some base of the serialization.
(I hope not to have forgotten any files)


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

include/wx/file.h

@@ -21,6 +21,8 @@
 #include  "wx/filefn.h"
 
 // ----------------------------------------------------------------------------
+<<<<<<< file.h
+=======
 // constants
 // ----------------------------------------------------------------------------
 
@@ -45,6 +47,7 @@ const off_t ofsInvalid = (off_t)-1;
 #define wxS_DEFAULT   (wxS_IRUSR | wxS_IWUSR | wxS_IRGRP | wxS_IROTH)
 
 // ----------------------------------------------------------------------------
+>>>>>>> 1.7
 // class wxFile: raw file IO
 //
 // NB: for space efficiency this class has no virtual functions, including
@@ -75,6 +78,11 @@ public:
   wxFile(int fd) { m_fd = fd; }
 
   // open/close
+<<<<<<< file.h
+  bool Create(const char *szFileName, bool bOverwrite = FALSE);
+  bool Open(const char *szFileName, OpenMode mode = read);
+  inline bool Close();  // Close is a NOP if not opened
+=======
     // create a new file (with the default value of bOverwrite, it will fail if
     // the file already exists, otherwise it will overwrite it and succeed)
   bool Create(const char *szFileName, bool bOverwrite = FALSE,
@@ -82,6 +90,7 @@ public:
   bool Open(const char *szFileName, OpenMode mode = read,
             int access = wxS_DEFAULT);
   bool Close();  // Close is a NOP if not opened
+>>>>>>> 1.7
 
   // assign an existing file descriptor and get it back from wxFile object
   void Attach(int fd) { Close(); m_fd = fd; }