X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce4169a4d129fc6cd165b2e9ccc5cf5d48356020..014b0d064e59429b7afe4466fa4f0a351d012fdc:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index a7fd1a2209..61c7923fa1 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -25,11 +25,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
+  #pragma hdrstop
 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
@@ -46,6 +42,7 @@
     #include "wx/intl.h"
 #endif
 
+
 #ifdef __WXGTK__
     #include "wx/mdi.h"
 #endif
@@ -63,12 +60,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "wx/ioswrap.h"
-
-#if wxUSE_IOSTREAMH
+#if wxUSE_STD_IOSTREAM
+  #include "wx/ioswrap.h"
+  #if wxUSE_IOSTREAMH
     #include <fstream.h>
-#else
+  #else
     #include <fstream>
+  #endif
+#else
+  #include "wx/wfstream.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -281,15 +281,20 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     else
         msgTitle = wxString(_("File error"));
 
-    ofstream store(file.fn_str());
+#if wxUSE_STD_IOSTREAM
+    ofstream store(wxString(file.fn_str()));
     if (store.fail() || store.bad())
+#else
+    wxFileOutputStream store(wxString(file.fn_str()));
+    if (store.LastError() != 0)
+#endif
     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
                            GetDocumentWindow());
         // Saving error
         return FALSE;
     }
-    if (SaveObject(store)==FALSE)
+    if (!SaveObject(store))
     {
         (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                            GetDocumentWindow());
@@ -312,14 +317,19 @@ bool wxDocument::OnOpenDocument(const wxString& file)
     else
         msgTitle = wxString(_("File error"));
 
-    ifstream store(file.fn_str());
+#if wxUSE_STD_IOSTREAM
+    ifstream store(wxString(file.fn_str()));
     if (store.fail() || store.bad())
+#else
+    wxFileInputStream store(wxString(file.fn_str()));
+    if (store.LastError() != 0)
+#endif
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
                            GetDocumentWindow());
         return FALSE;
     }
-    if (LoadObject(store)==FALSE)
+    if (!LoadObject(store))
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
                            GetDocumentWindow());
@@ -334,17 +344,21 @@ bool wxDocument::OnOpenDocument(const wxString& file)
     return TRUE;
 }
 
+#if wxUSE_STD_IOSTREAM
 istream& wxDocument::LoadObject(istream& stream)
+#else
+wxInputStream& wxDocument::LoadObject(wxInputStream& stream)
+#endif
 {
-    //  wxObject::LoadObject(stream);
-
     return stream;
 }
 
+#if wxUSE_STD_IOSTREAM
 ostream& wxDocument::SaveObject(ostream& stream)
+#else
+wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
+#endif
 {
-    //  wxObject::SaveObject(stream);
-
     return stream;
 }
 
@@ -817,7 +831,7 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 
     wxPrintDialogData data;
 
-    wxPrintDialog printerDialog(parentWin, & data);
+    wxPrintDialog printerDialog(parentWin, &data);
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
     printerDialog.ShowModal();
 #endif // wxUSE_PRINTING_ARCHITECTURE
@@ -1280,7 +1294,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
     }
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
-            strings, data);
+            strings, (char **)data);
     delete[] strings;
     delete[] data;
     return theTemplate;
@@ -1303,7 +1317,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         }
     }
     wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
-            strings, data);
+            strings, (char **)data);
     delete[] strings;
     delete[] data;
     return theTemplate;
@@ -1947,6 +1961,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 // manipulate files directly
 // ----------------------------------------------------------------------------
 
+#if wxUSE_STD_IOSTREAM
 bool wxTransferFileToStream(const wxString& filename, ostream& stream)
 {
     FILE *fd1;
@@ -1981,6 +1996,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
     fclose (fd1);
     return TRUE;
 }
+#endif
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE