Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 9d15b4f9b65d501e7dd71a5bce998b04666b42fa..362b1861d6b09cfa25b71f52bf407ba44ef51119 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -1,31 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fstream.cpp
+// Name:        src/common/wfstream.cpp
 // Purpose:     "File stream" classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     11/07/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "wfstream.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #if wxUSE_STREAMS
 
-#include <stdio.h>
-#include "wx/stream.h"
 #include "wx/wfstream.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/stream.h"
+#endif
+
+#include <stdio.h>
+
 #if wxUSE_FILE
 
 // ----------------------------------------------------------------------------
@@ -37,6 +36,8 @@ wxFileInputStream::wxFileInputStream(const wxString& fileName)
 {
     m_file = new wxFile(fileName, wxFile::read);
     m_file_destroy = true;
+    if ( !m_file->IsOpened() )
+        m_lasterror = wxSTREAM_READ_ERROR;
 }
 
 wxFileInputStream::wxFileInputStream()
@@ -105,6 +106,11 @@ wxFileOffset wxFileInputStream::OnSysTell() const
     return m_file->Tell();
 }
 
+bool wxFileInputStream::IsOk() const
+{
+    return wxInputStream::IsOk() && m_file->IsOpened();
+}
+
 // ----------------------------------------------------------------------------
 // wxFileOutputStream
 // ----------------------------------------------------------------------------
@@ -115,14 +121,7 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
     m_file_destroy = true;
 
     if (!m_file->IsOpened())
-    {
         m_lasterror = wxSTREAM_WRITE_ERROR;
-    }
-    else
-    {
-        if (m_file->Error())
-            m_lasterror = wxSTREAM_WRITE_ERROR;
-    }
 }
 
 wxFileOutputStream::wxFileOutputStream(wxFile& file)
@@ -183,6 +182,11 @@ wxFileOffset wxFileOutputStream::GetLength() const
     return m_file->Length();
 }
 
+bool wxFileOutputStream::IsOk() const
+{
+    return wxOutputStream::IsOk() && m_file->IsOpened();
+}
+
 // ----------------------------------------------------------------------------
 // wxTempFileOutputStream
 // ----------------------------------------------------------------------------
@@ -215,12 +219,24 @@ size_t wxTempFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 // ----------------------------------------------------------------------------
 
 wxFileStream::wxFileStream(const wxString& fileName)
-            : wxFileInputStream(fileName)
+            : wxFileInputStream(),
+              wxFileOutputStream()
+{
+    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
 {
-    wxFileOutputStream::m_file = wxFileInputStream::m_file;
+    return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk();
 }
 
-#endif //wxUSE_FILE
+#endif // wxUSE_FILE
 
 #if wxUSE_FFILE
 
@@ -229,11 +245,14 @@ wxFileStream::wxFileStream(const wxString& fileName)
 // ----------------------------------------------------------------------------
 
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
-                                       const wxChar *mode)
+                                       const wxString& mode)
                   : wxInputStream()
 {
     m_file = new wxFFile(fileName, mode);
     m_file_destroy = true;
+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;
 }
 
 wxFFileInputStream::wxFFileInputStream()
@@ -292,12 +311,17 @@ wxFileOffset wxFFileInputStream::OnSysTell() const
     return m_file->Tell();
 }
 
+bool wxFFileInputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();
+}
+
 // ----------------------------------------------------------------------------
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName,
-                                         const wxChar *mode)
+                                         const wxString& mode)
 {
     m_file = new wxFFile(fileName, mode);
     m_file_destroy = true;
@@ -373,17 +397,34 @@ wxFileOffset wxFFileOutputStream::GetLength() const
     return m_file->Length();
 }
 
+bool wxFFileOutputStream::IsOk() const
+{
+    return wxStreamBase::IsOk() && m_file->IsOpened();
+}
+
 // ----------------------------------------------------------------------------
 // wxFFileStream
 // ----------------------------------------------------------------------------
 
-wxFFileStream::wxFFileStream(const wxString& fileName)
-             : wxFFileInputStream(fileName)
+wxFFileStream::wxFFileStream(const wxString& fileName, const wxString& mode)
+             : wxFFileInputStream(),
+               wxFFileOutputStream()
+{
+    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
 {
-    wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
+    return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk();
 }
 
 #endif //wxUSE_FFILE
 
 #endif // wxUSE_STREAMS
-