More _T() in asserts...

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index cb1ddc4380da6fc4bbf0870ea25b5b74f61e2e22..465f22a2be88f4779803e442f21962722fbb538f 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -25,11 +25,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-    #pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
+  #pragma hdrstop

 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE
 #endif
 
 #if wxUSE_DOC_VIEW_ARCHITECTURE


@@ -50,21 +46,28 @@
     #include "wx/mdi.h"
 #endif
 
     #include "wx/mdi.h"
 #endif
 

+#if wxUSE_PRINTING_ARCHITECTURE
+  #include "wx/prntbase.h"
+  #include "wx/printdlg.h"
+#endif
+

 #include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
 #include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"

-#include "wx/printdlg.h"

 #include "wx/confbase.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include "wx/confbase.h"
 
 #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>
     #include <fstream.h>

-#else
+  #else

     #include <fstream>
     #include <fstream>

+  #endif
+#else
+  #include "wx/wfstream.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -240,9 +243,7 @@ bool wxDocument::SaveAs()
         return FALSE;
 
     wxString fileName(tmp);
         return FALSE;
 
     wxString fileName(tmp);

-    wxString path("");
-    wxString name("");
-    wxString ext("");
+    wxString path, name, ext;

     wxSplitPath(fileName, & path, & name, & ext);
 
     if (ext.IsEmpty() || ext == _T(""))
     wxSplitPath(fileName, & path, & name, & ext);
 
     if (ext.IsEmpty() || ext == _T(""))


@@ -279,8 +280,13 @@ bool wxDocument::OnSaveDocument(const wxString& file)
     else
         msgTitle = wxString(_("File error"));
 
     else
         msgTitle = wxString(_("File error"));
 

+#if wxUSE_STD_IOSTREAM

     ofstream store(file.fn_str());
     if (store.fail() || store.bad())
     ofstream store(file.fn_str());
     if (store.fail() || store.bad())

+#else
+    wxFileOutputStream store(file.fn_str());
+    if (store.LastError() != 0)
+#endif

     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
                            GetDocumentWindow());
     {
         (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
                            GetDocumentWindow());


@@ -310,8 +316,13 @@ bool wxDocument::OnOpenDocument(const wxString& file)
     else
         msgTitle = wxString(_("File error"));
 
     else
         msgTitle = wxString(_("File error"));
 

+#if wxUSE_STD_IOSTREAM

     ifstream store(file.fn_str());
     if (store.fail() || store.bad())
     ifstream store(file.fn_str());
     if (store.fail() || store.bad())

+#else
+    wxFileInputStream store(file.fn_str());
+    if (store.LastError() != 0)
+#endif

     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
                            GetDocumentWindow());
     {
         (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
                            GetDocumentWindow());


@@ -332,19 +343,27 @@ bool wxDocument::OnOpenDocument(const wxString& file)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#if wxUSE_STD_IOSTREAM

 istream& wxDocument::LoadObject(istream& stream)
 {
 istream& wxDocument::LoadObject(istream& stream)
 {

-    //  wxObject::LoadObject(stream);
-

     return stream;
 }
 
 ostream& wxDocument::SaveObject(ostream& stream)
 {
     return stream;
 }
 
 ostream& wxDocument::SaveObject(ostream& stream)
 {

-    //  wxObject::SaveObject(stream);
-

     return stream;
 }
     return stream;
 }

+#else
+bool wxDocument::LoadObject(wxInputStream& stream)
+{
+    return TRUE;
+}
+
+bool wxDocument::SaveObject(wxOutputStream& stream)
+{
+    return TRUE;
+}
+#endif

 
 bool wxDocument::Revert()
 {
 
 bool wxDocument::Revert()
 {


@@ -669,9 +688,11 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
     EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
     EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
     EVT_MENU(wxID_SAVEAS, wxDocManager::OnFileSaveAs)
     EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
     EVT_MENU(wxID_REDO, wxDocManager::OnRedo)

+#if wxUSE_PRINTING_ARCHITECTURE

     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
     EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
     EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)

+#endif

 END_EVENT_TABLE()
 
 wxDocManager::wxDocManager(long flags, bool initialize)
 END_EVENT_TABLE()
 
 wxDocManager::wxDocManager(long flags, bool initialize)


@@ -787,6 +808,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_PRINTING_ARCHITECTURE

     wxView *view = GetCurrentView();
     if (!view)
         return;
     wxView *view = GetCurrentView();
     if (!view)
         return;


@@ -799,10 +821,12 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 
         delete printout;
     }
 
         delete printout;
     }

+#endif // wxUSE_PRINTING_ARCHITECTURE

 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_PRINTING_ARCHITECTURE

     wxWindow *parentWin = wxTheApp->GetTopWindow();
     wxView *view = GetCurrentView();
     if (view)
     wxWindow *parentWin = wxTheApp->GetTopWindow();
     wxView *view = GetCurrentView();
     if (view)


@@ -813,10 +837,12 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
     wxPrintDialog printerDialog(parentWin, & data);
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
     printerDialog.ShowModal();
     wxPrintDialog printerDialog(parentWin, & data);
     printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
     printerDialog.ShowModal();

+#endif // wxUSE_PRINTING_ARCHITECTURE

 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_PRINTING_ARCHITECTURE

     wxView *view = GetCurrentView();
     if (!view)
         return;
     wxView *view = GetCurrentView();
     if (!view)
         return;


@@ -834,6 +860,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
         frame->Initialize();
         frame->Show(TRUE);
     }
         frame->Initialize();
         frame->Show(TRUE);
     }

+#endif // wxUSE_PRINTING_ARCHITECTURE

 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))


@@ -1154,7 +1181,11 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,

+#ifdef __WXMSW__

                                                 int noTemplates,
                                                 int noTemplates,

+#else
+                                                int WXUNUSED(noTemplates),
+#endif

                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))


@@ -1183,9 +1214,12 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
     int FilterIndex = 0;
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
 
     int FilterIndex = 0;
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),

-                                        _T(""), _T(""), _T(""),
+                                        _T(""),
+                                        _T(""),

                                         &FilterIndex,
                                         &FilterIndex,

-                                        descrBuf, 0, wxTheApp->GetTopWindow());
+                                        descrBuf,
+                                        0,
+                                        wxTheApp->GetTopWindow());

 
     if (!pathTmp.IsEmpty())
     {
 
     if (!pathTmp.IsEmpty())
     {


@@ -1263,7 +1297,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
     }
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,
     }
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document template"), _("Templates"), n,

-            strings, data);
+            strings, (char **)data);

     delete[] strings;
     delete[] data;
     return theTemplate;
     delete[] strings;
     delete[] data;
     return theTemplate;


@@ -1286,7 +1320,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         }
     }
     wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,
         }
     }
     wxDocTemplate *theTemplate = (wxDocTemplate *)wxGetSingleChoiceData(_("Select a document view"), _("Views"), n,

-            strings, data);
+            strings, (char **)data);

     delete[] strings;
     delete[] data;
     return theTemplate;
     delete[] strings;
     delete[] data;
     return theTemplate;


@@ -1930,6 +1964,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
 // manipulate files directly
 // ----------------------------------------------------------------------------
 
 // manipulate files directly
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STD_IOSTREAM

 bool wxTransferFileToStream(const wxString& filename, ostream& stream)
 {
     FILE *fd1;
 bool wxTransferFileToStream(const wxString& filename, ostream& stream)
 {
     FILE *fd1;


@@ -1964,6 +1999,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
     fclose (fd1);
     return TRUE;
 }
     fclose (fd1);
     return TRUE;
 }

+#endif

 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE
 
 
 #endif // wxUSE_DOC_VIEW_ARCHITECTURE