fill in sqlDataType field of wxDbColInf in ExecSql() (patch 1614539)

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index a142d44f7c49aba230b1160106220867a8b392a3..25327f1489dde8a578d9431dab54d620652ddf74 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -9,23 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_STREAMS
 
 #endif
 
 #if wxUSE_STREAMS
 

-#include <stdio.h>
-#include "wx/stream.h"

 #include "wx/wfstream.h"
 
 #include "wx/wfstream.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/stream.h"
+#endif
+
+#include <stdio.h>
+

 #if wxUSE_FILE
 
 // ----------------------------------------------------------------------------
 #if wxUSE_FILE
 
 // ----------------------------------------------------------------------------


@@ -107,6 +107,11 @@ wxFileOffset wxFileInputStream::OnSysTell() const
     return m_file->Tell();
 }
 
     return m_file->Tell();
 }
 

+bool wxFileInputStream::IsOk() const 
+{ 
+    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+}
+

 // ----------------------------------------------------------------------------
 // wxFileOutputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileOutputStream
 // ----------------------------------------------------------------------------


@@ -178,6 +183,11 @@ wxFileOffset wxFileOutputStream::GetLength() const
     return m_file->Length();
 }
 
     return m_file->Length();
 }
 

+bool wxFileOutputStream::IsOk() const 
+{ 
+    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+}
+

 // ----------------------------------------------------------------------------
 // wxTempFileOutputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTempFileOutputStream
 // ----------------------------------------------------------------------------


@@ -229,6 +239,9 @@ wxFFileInputStream::wxFFileInputStream(const wxString& fileName,
 {
     m_file = new wxFFile(fileName, mode);
     m_file_destroy = true;
 {
     m_file = new wxFFile(fileName, mode);
     m_file_destroy = true;

+
+    if (!m_file->IsOpened())
+        m_lasterror = wxSTREAM_WRITE_ERROR;

 }
 
 wxFFileInputStream::wxFFileInputStream()
 }
 
 wxFFileInputStream::wxFFileInputStream()


@@ -287,6 +300,11 @@ wxFileOffset wxFFileInputStream::OnSysTell() const
     return m_file->Tell();
 }
 
     return m_file->Tell();
 }
 

+bool wxFFileInputStream::IsOk() const 
+{ 
+    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+}
+

 // ----------------------------------------------------------------------------
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFFileOutputStream
 // ----------------------------------------------------------------------------


@@ -368,6 +386,11 @@ wxFileOffset wxFFileOutputStream::GetLength() const
     return m_file->Length();
 }
 
     return m_file->Length();
 }
 

+bool wxFFileOutputStream::IsOk() const 
+{ 
+    return (wxStreamBase::IsOk() && m_file->IsOpened()); 
+}
+

 // ----------------------------------------------------------------------------
 // wxFFileStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFFileStream
 // ----------------------------------------------------------------------------


@@ -381,4 +404,3 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
 #endif //wxUSE_FFILE
 
 #endif // wxUSE_STREAMS
 #endif //wxUSE_FFILE
 
 #endif // wxUSE_STREAMS

-