Fix interface definition of GetMouseCursorAt

[wxWidgets.git] / src / common / wfstream.cpp

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 65e8ceb266e31b9dcf4d391b5fa55a06a9c357d4..1eca40cd08a51c5e993f2d36b5e0beca9350f435 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/common/fstream.cpp
+// Name:        src/common/wfstream.cpp

 // Purpose:     "File stream" classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     "File stream" classes
 // Author:      Julian Smart
 // Modified by:


@@ -220,9 +220,16 @@ size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 // ----------------------------------------------------------------------------
 
 wxFileStream::wxFileStream(const wxString& fileName)
 // ----------------------------------------------------------------------------
 
 wxFileStream::wxFileStream(const wxString& fileName)

-            : wxFileInputStream(fileName)
+            : wxFileInputStream(),
+              wxFileOutputStream()

 {
 {

-    wxFileOutputStream::m_file = wxFileInputStream::m_file;
+    wxFileOutputStream::m_file =
+    wxFileInputStream::m_file = new wxFile(fileName, wxFile::read_write);
+
+    // this is a bit ugly as streams are symmetric but we still have to delete
+    // the file we created above exactly once so we decide to (arbitrarily) do
+    // it in wxFileInputStream
+    wxFileInputStream::m_file_destroy = true;

 }
 
 bool wxFileStream::IsOk() const
 }
 
 bool wxFileStream::IsOk() const


@@ -400,10 +407,18 @@ bool wxFFileOutputStream::IsOk() const
 // wxFFileStream
 // ----------------------------------------------------------------------------
 
 // wxFFileStream
 // ----------------------------------------------------------------------------
 

-wxFFileStream::wxFFileStream(const wxString& fileName)
-             : wxFFileInputStream(fileName)
+wxFFileStream::wxFFileStream(const wxString& fileName, const wxString& mode)
+             : wxFFileInputStream(),
+               wxFFileOutputStream()

 {
 {

-    wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
+    wxASSERT_MSG( mode.find_first_of('+') != wxString::npos,
+                  "must be opened in read-write mode for this class to work" );
+
+    wxFFileOutputStream::m_file =
+    wxFFileInputStream::m_file = new wxFFile(fileName, mode);
+
+    // see comment in wxFileStream ctor
+    wxFFileInputStream::m_file_destroy = true;

 }
 
 bool wxFFileStream::IsOk() const
 }
 
 bool wxFFileStream::IsOk() const