add wxSizer::SetDimension() overload taking wxPoint/wxSize instead of 4 ints

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 1f1600deffd66ba20e270206639ac6f83baedad9..65e8ceb266e31b9dcf4d391b5fa55a06a9c357d4 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -109,7 +109,7 @@ wxFileOffset wxFileInputStream::OnSysTell() const
 
 bool wxFileInputStream::IsOk() const
 {
 
 bool wxFileInputStream::IsOk() const
 {

-    return wxStreamBase::IsOk() && m_file->IsOpened();
+    return wxInputStream::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -185,7 +185,7 @@ wxFileOffset wxFileOutputStream::GetLength() const
 
 bool wxFileOutputStream::IsOk() const
 {
 
 bool wxFileOutputStream::IsOk() const
 {

-    return wxStreamBase::IsOk() && m_file->IsOpened();
+    return wxOutputStream::IsOk() && m_file->IsOpened();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -227,10 +227,10 @@ wxFileStream::wxFileStream(const wxString& fileName)
 
 bool wxFileStream::IsOk() const
 {
 
 bool wxFileStream::IsOk() const
 {

-    return wxStreamBase::IsOk() && wxFileInputStream::m_file->IsOpened();
+    return wxFileOutputStream::IsOk() && wxFileInputStream::IsOk();

 }
 
 }
 

-#endif //wxUSE_FILE
+#endif // wxUSE_FILE

 
 #if wxUSE_FFILE
 
 
 #if wxUSE_FFILE
 


@@ -406,6 +406,11 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 

+bool wxFFileStream::IsOk() const
+{
+    return wxFFileOutputStream::IsOk() && wxFFileInputStream::IsOk();
+}
+

 #endif //wxUSE_FFILE
 
 #endif // wxUSE_STREAMS
 #endif //wxUSE_FFILE
 
 #endif // wxUSE_STREAMS