Replaced (char*)wxFNCONV with (const char*)wxFNCONV

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index a6687e39a6eb591034f0fc768267e769e82c4712..fcfe8743a0598ec3de560612630da7d46c58032f 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -42,6 +42,7 @@
     #include "wx/intl.h"
 #endif
 
+
 #ifdef __WXGTK__
     #include "wx/mdi.h"
 #endif
@@ -281,10 +282,10 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM
-    ofstream store(file.fn_str());
+    ofstream store(FNSTRINGCAST file.fn_str());
     if (store.fail() || store.bad())
 #else
-    wxFileOutputStream store(file.fn_str());
+    wxFileOutputStream store(FNSTRINGCAST file.fn_str());
     if (store.LastError() != 0)
 #endif
     {
@@ -293,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());
@@ -317,10 +318,10 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         msgTitle = wxString(_("File error"));
 
 #if wxUSE_STD_IOSTREAM
-    ifstream store(file.fn_str());
+    ifstream store(FNSTRINGCAST file.fn_str());
     if (store.fail() || store.bad())
 #else
-    wxFileInputStream store(file.fn_str());
+    wxFileInputStream store(FNSTRINGCAST file.fn_str());
     if (store.LastError() != 0)
 #endif
     {
@@ -328,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());
@@ -345,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()
 {
@@ -834,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
@@ -1297,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;
@@ -1320,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;