don't test for both stream.fail() and stream.bad() as the latter implies the former...

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index e308d867c016d9ae5ce405854fd12d13e4a5d06d..a4e3f5df6081f5aaa51b6d90aa896ebede6b5e98 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -582,10 +582,10 @@ bool wxDocument::DoSaveDocument(const wxString& file)
 {
 #if wxUSE_STD_IOSTREAM
     wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);
 {
 #if wxUSE_STD_IOSTREAM
     wxSTD ofstream store(file.mb_str(), wxSTD ios::binary);

-    if (store.fail() || store.bad())
+    if ( !store )

 #else
     wxFileOutputStream store(file);
 #else
     wxFileOutputStream store(file);

-    if (store.GetLastError() != wxSTREAM_NO_ERROR)
+    if ( store.GetLastError() != wxSTREAM_NO_ERROR )

 #endif
     {
         wxLogError(_("File \"%s\" could not be opened for writing."), file);
 #endif
     {
         wxLogError(_("File \"%s\" could not be opened for writing."), file);


@@ -605,7 +605,7 @@ bool wxDocument::DoOpenDocument(const wxString& file)
 {
 #if wxUSE_STD_IOSTREAM
     wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);
 {
 #if wxUSE_STD_IOSTREAM
     wxSTD ifstream store(file.mb_str(), wxSTD ios::binary);

-    if ( store.fail() || store.bad() )
+    if ( !store )

 #else
     wxFileInputStream store(file);
     if (store.GetLastError() != wxSTREAM_NO_ERROR)
 #else
     wxFileInputStream store(file);
     if (store.GetLastError() != wxSTREAM_NO_ERROR)


@@ -617,7 +617,7 @@ bool wxDocument::DoOpenDocument(const wxString& file)
 
 #if wxUSE_STD_IOSTREAM
     LoadObject(store);
 
 #if wxUSE_STD_IOSTREAM
     LoadObject(store);

-    if ( store.fail() || store.bad() )
+    if ( !store )

 #else
     int res = LoadObject(store).GetLastError();
     if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF )
 #else
     int res = LoadObject(store).GetLastError();
     if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF )