Some tweaks...

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index e5dda96883e32e319eec87af0a5cab062e4be351..fcfe8743a0598ec3de560612630da7d46c58032f 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -294,7 +294,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         // Saving error
         return FALSE;
     }
-    if (SaveObject(store)==FALSE)
+    if (!SaveObject(store))
     {
         (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                            GetDocumentWindow());
@@ -329,7 +329,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
                            GetDocumentWindow());
         return FALSE;
     }
-    if (LoadObject(store)==FALSE)
+    if (!LoadObject(store))
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
                            GetDocumentWindow());
@@ -346,25 +346,21 @@ bool wxDocument::OnOpenDocument(const wxString& file)
 
 #if wxUSE_STD_IOSTREAM
 istream& wxDocument::LoadObject(istream& stream)
+#else
+wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
+#endif
 {
     return stream;
 }
 
+#if wxUSE_STD_IOSTREAM
 ostream& wxDocument::SaveObject(ostream& stream)
-{
-    return stream;
-}
 #else
-bool wxDocument::LoadObject(wxInputStream& stream)
-{
-    return TRUE;
-}
-
-bool wxDocument::SaveObject(wxOutputStream& stream)
+wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
+#endif
 {
-    return TRUE;
+    return stream;
 }
-#endif
 
 bool wxDocument::Revert()
 {