wxWindow::Fit() infinite loop bug fixed

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 00c7bcc466bec700f57b75edb0c7e36653379c1d..ece6ec34a4c61a284bce669a34512105dd98028c 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -43,7 +43,7 @@
     #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();
 }
@@ -240,9 +241,7 @@ 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 == _T(""))
@@ -372,7 +371,7 @@ bool wxDocument::GetPrintableName(wxString& buf) const
     }
 }
 
-wxWindow *wxDocument::GetDocumentWindow(void) const
+wxWindow *wxDocument::GetDocumentWindow() const
 {
     wxView *view = GetFirstView();
     if (view)
@@ -576,7 +575,7 @@ wxPrintout *wxView::OnCreatePrintout()
 {
     return new wxDocPrintout(this);
 }
-#endif
+#endif // wxUSE_PRINTING_ARCHITECTURE
 
 // ----------------------------------------------------------------------------
 // wxDocTemplate
@@ -649,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
 // ----------------------------------------------------------------------------
@@ -780,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;
@@ -792,6 +799,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
 
         delete printout;
     }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
@@ -810,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;
@@ -827,6 +836,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
         frame->Initialize();
         frame->Show(TRUE);
     }
+#endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
@@ -847,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;
@@ -1034,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();
@@ -1112,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();
@@ -1121,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;
@@ -1153,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))
@@ -1180,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())
     {
@@ -1195,6 +1209,9 @@ 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
@@ -1654,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;