IRIX compile fixes

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 4d94a0abcfedb4e5f4ed68eb5be8497da0d49a57..ece6ec34a4c61a284bce669a34512105dd98028c 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -39,11 +39,11 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/dc.h"
-#include "wx/dialog.h"
+    #include "wx/dialog.h"
     #include "wx/menu.h"
     #include "wx/list.h"
     #include "wx/filedlg.h"
-    #include <wx/intl.h>
+    #include "wx/intl.h"
 #endif
 
 #ifdef __WXGTK__
@@ -53,6 +53,7 @@
 #include "wx/msgdlg.h"
 #include "wx/choicdlg.h"
 #include "wx/docview.h"
+#include "wx/prntbase.h"
 #include "wx/printdlg.h"
 #include "wx/confbase.h"
 
@@ -178,14 +179,14 @@ bool wxDocument::DeleteAllViews()
     return TRUE;
 }
 
-wxView *wxDocument::GetFirstView(void) const
+wxView *wxDocument::GetFirstView() const
 {
     if (m_documentViews.Number() == 0)
         return (wxView *) NULL;
     return (wxView *)m_documentViews.First()->Data();
 }
 
-wxDocManager *wxDocument::GetDocumentManager(void) const
+wxDocManager *wxDocument::GetDocumentManager() const
 {
     return m_documentTemplate->GetDocumentManager();
 }
@@ -213,7 +214,7 @@ bool wxDocument::Save()
     bool ret = FALSE;
 
     if (!IsModified()) return TRUE;
-    if (m_documentFile == "" || !m_savedYet)
+    if (m_documentFile == _T("") || !m_savedYet)
         ret = SaveAs();
     else
         ret = OnSaveDocument(m_documentFile);
@@ -240,12 +241,10 @@ bool wxDocument::SaveAs()
         return FALSE;
 
     wxString fileName(tmp);
-    wxString path("");
-    wxString name("");
-    wxString ext("");
+    wxString path, name, ext;
     wxSplitPath(fileName, & path, & name, & ext);
 
-    if (ext.IsEmpty() || ext == "")
+    if (ext.IsEmpty() || ext == _T(""))
     {
         fileName += ".";
         fileName += docTemplate->GetDefaultExtension();
@@ -274,7 +273,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         return FALSE;
 
     wxString msgTitle;
-    if (wxTheApp->GetAppName() != "")
+    if (wxTheApp->GetAppName() != _T(""))
         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));
@@ -305,7 +304,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         return FALSE;
 
     wxString msgTitle;
-    if (wxTheApp->GetAppName() != "")
+    if (wxTheApp->GetAppName() != _T(""))
         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));
@@ -355,12 +354,12 @@ bool wxDocument::Revert()
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
-    if (m_documentTitle != "")
+    if (m_documentTitle != _T(""))
     {
         buf = m_documentTitle;
         return TRUE;
     }
-    else if (m_documentFile != "")
+    else if (m_documentFile != _T(""))
     {
         buf = wxFileNameFromPath(m_documentFile);
         return TRUE;
@@ -372,7 +371,7 @@ bool wxDocument::GetPrintableName(wxString& buf) const
     }
 }
 
-wxWindow *wxDocument::GetDocumentWindow(void) const
+wxWindow *wxDocument::GetDocumentWindow() const
 {
     wxView *view = GetFirstView();
     if (view)
@@ -395,7 +394,7 @@ bool wxDocument::OnSaveModified()
         GetPrintableName(title);
 
         wxString msgTitle;
-        if (wxTheApp->GetAppName() != "")
+        if (wxTheApp->GetAppName() != _T(""))
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
@@ -576,7 +575,7 @@ wxPrintout *wxView::OnCreatePrintout()
 {
     return new wxDocPrintout(this);
 }
-#endif
+#endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------
 // wxDocTemplate
@@ -594,7 +593,6 @@ wxDocTemplate::wxDocTemplate(wxDocManager *manager,
                              long flags)
 {
     m_documentManager = manager;
-    m_flags = flags;
     m_description = descr;
     m_directory = dir;
     m_defaultExt = ext;
@@ -650,6 +648,13 @@ wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
     }
 }
 
+// The default (very primitive) format detection: check is the extension is
+// that of the template
+bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
+{
+    return GetDefaultExtension().IsSameAs(FindExtension(path));
+}
+
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------
@@ -781,6 +786,7 @@ void wxDocManager::OnFileSaveAs(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_PRINTING_ARCHITECTURE
     wxView *view = GetCurrentView();
     if (!view)
         return;
@@ -793,6 +799,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 
         delete printout;
     }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
@@ -811,6 +818,7 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_PRINTING_ARCHITECTURE
     wxView *view = GetCurrentView();
     if (!view)
         return;
@@ -828,6 +836,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
         frame->Initialize();
         frame->Show(TRUE);
     }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
@@ -848,7 +857,7 @@ void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
         doc->GetCommandProcessor()->Redo();
 }
 
-wxView *wxDocManager::GetCurrentView(void) const
+wxView *wxDocManager::GetCurrentView() const
 {
     if (m_currentView)
         return m_currentView;
@@ -948,8 +957,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     // Existing document
     wxDocTemplate *temp = (wxDocTemplate *) NULL;
 
-    wxString path2("");
-    if (path != "")
+    wxString path2(_T(""));
+    if (path != _T(""))
         path2 = path;
 
     if (flags & wxDOC_SILENT)
@@ -1035,7 +1044,7 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
     return FALSE;
 }
 
-wxDocument *wxDocManager::GetCurrentDocument(void) const
+wxDocument *wxDocManager::GetCurrentDocument() const
 {
     if (m_currentView)
         return m_currentView->GetDocument();
@@ -1113,7 +1122,7 @@ void wxDocManager::FileHistoryAddFilesToMenu()
         m_fileHistory->AddFilesToMenu();
 }
 
-int wxDocManager::GetNoHistoryFiles(void) const
+int wxDocManager::GetNoHistoryFiles() const
 {
     if (m_fileHistory)
         return m_fileHistory->GetNoHistoryFiles();
@@ -1122,24 +1131,18 @@ int wxDocManager::GetNoHistoryFiles(void) const
 }
 
 
-// Given a path, try to find a matching template. Won't always work, of
-// course.
+// Find out the document template via matching in the document file format
+// against that of the template
 wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 {
-    wxString theExt = FindExtension(path);
-    if (!theExt)
-        return (wxDocTemplate *) NULL;
     wxDocTemplate *theTemplate = (wxDocTemplate *) NULL;
 
-    if (m_templates.Number() == 1)
-        return (wxDocTemplate *)m_templates.First()->Data();
-
     // Find the template which this extension corresponds to
     int i;
     for (i = 0; i < m_templates.Number(); i++)
     {
         wxDocTemplate *temp = (wxDocTemplate *)m_templates.Nth(i)->Data();
-        if (wxStrcmp(temp->GetDefaultExtension(), theExt) == 0)
+        if ( temp->FileMatchesTemplate(path) )
         {
             theTemplate = temp;
             break;
@@ -1154,7 +1157,11 @@ wxDocTemplate *wxDocManager::FindTemplateForPath(const wxString& path)
 // template extension.
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
+#ifdef __WXMSW__
                                                 int noTemplates,
+#else
+                                                int WXUNUSED(noTemplates),
+#endif
                                                 wxString& path,
                                                 long WXUNUSED(flags),
                                                 bool WXUNUSED(save))
@@ -1181,8 +1188,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     wxString descrBuf = _T("*.*");
 #endif
 
-    wxString pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""), _T(""),
-            descrBuf, 0, wxTheApp->GetTopWindow());
+    int FilterIndex = 0;
+    wxString pathTmp = wxFileSelectorEx(_("Select a file"),
+                                        _T(""),
+                                        _T(""),
+                                        &FilterIndex,
+                                        descrBuf,
+                                        0,
+                                        wxTheApp->GetTopWindow());
 
     if (!pathTmp.IsEmpty())
     {
@@ -1196,11 +1209,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         // one. We really want to know exactly which template was
         // chosen by using a more advanced file selector.
         wxDocTemplate *theTemplate = FindTemplateForPath(path);
+        if ( !theTemplate )
+            theTemplate = templates[FilterIndex];
+
         return theTemplate;
     }
     else
     {
-        path = "";
+        path = _T("");
         return (wxDocTemplate *) NULL;
     }
 #if 0
@@ -1211,7 +1227,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     if (!temp)
         return (wxDocTemplate *) NULL;
 
-    char *pathTmp = wxFileSelector(_("Select a file"), "", "",
+    wxChar *pathTmp = wxFileSelector(_("Select a file"), _T(""), _T(""),
             temp->GetDefaultExtension(),
             temp->GetFileFilter(),
             0, wxTheApp->GetTopWindow());
@@ -1272,7 +1288,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
-        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != ""))
+        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != _T("")))
         {
             strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
             data[n] = (wxChar *)templates[i];
@@ -1446,7 +1462,7 @@ void wxDocParentFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
     wxString f(m_docManager->GetHistoryFile(event.GetSelection() - wxID_FILE1));
-    if (f != "")
+    if (f != _T(""))
         (void)m_docManager->CreateDocument(f, wxDOC_SILENT);
 }
 
@@ -1655,14 +1671,14 @@ bool wxCommandProcessor::Redo()
     return FALSE;
 }
 
-bool wxCommandProcessor::CanUndo(void) const
+bool wxCommandProcessor::CanUndo() const
 {
     if (m_currentCommand)
         return ((wxCommand *)m_currentCommand->Data())->CanUndo();
     return FALSE;
 }
 
-bool wxCommandProcessor::CanRedo(void) const
+bool wxCommandProcessor::CanRedo() const
 {
     if ((m_currentCommand != (wxNode*) NULL) && (m_currentCommand->Next() == (wxNode*) NULL))
         return FALSE;
@@ -1691,7 +1707,7 @@ void wxCommandProcessor::SetMenuStrings()
         {
             wxCommand *command = (wxCommand *)m_currentCommand->Data();
             wxString commandName(command->GetName());
-            if (commandName == "") commandName = _("Unnamed command");
+            if (commandName == _T("")) commandName = _("Unnamed command");
             bool canUndo = command->CanUndo();
             if (canUndo)
                 buf = wxString(_("&Undo ")) + commandName;
@@ -1706,7 +1722,7 @@ void wxCommandProcessor::SetMenuStrings()
             {
                 wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
                 wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == "") redoCommandName = _("Unnamed command");
+                if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1733,7 +1749,7 @@ void wxCommandProcessor::SetMenuStrings()
                 // we've undone to the start of the list, but can redo the first.
                 wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
                 wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == "") redoCommandName = _("Unnamed command");
+                if (redoCommandName == _T("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1855,7 +1871,7 @@ void wxFileHistory::Load(wxConfigBase& config)
     wxString buf;
     buf.Printf(_T("file%d"), m_fileHistoryN+1);
     wxString historyFile;
-    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != ""))
+    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != _T("")))
     {
         m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
         m_fileHistoryN ++;