fixed GetWeekOfYear() for first/last week in some cases (patch 908793)

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ef47161018b674ee29cd31d2c2038e1fd61e1789..ed5f74fa68eb44f4f659b382cb78d2da8efb41a9 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "docview.h"
 #endif
 
     #pragma implementation "docview.h"
 #endif
 


@@ -80,7 +80,7 @@
 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

-// wxWindows macros
+// wxWidgets macros

 // ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)


@@ -101,6 +101,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 // ----------------------------------------------------------------------------
 
 static inline wxString FindExtension(const wxChar *path);
 // ----------------------------------------------------------------------------
 
 static inline wxString FindExtension(const wxChar *path);

+static wxWindow* wxFindSuitableParent(void);

 
 // ----------------------------------------------------------------------------
 // local constants
 
 // ----------------------------------------------------------------------------
 // local constants


@@ -132,16 +133,16 @@ static wxString FindExtension(const wxChar *path)
 
 wxDocument::wxDocument(wxDocument *parent)
 {
 
 wxDocument::wxDocument(wxDocument *parent)
 {

-    m_documentModified = FALSE;
+    m_documentModified = false;

     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;
     m_commandProcessor = (wxCommandProcessor*) NULL;
     m_documentParent = parent;
     m_documentTemplate = (wxDocTemplate *) NULL;
     m_commandProcessor = (wxCommandProcessor*) NULL;

-    m_savedYet = FALSE;
+    m_savedYet = false;

 }
 
 bool wxDocument::DeleteContents()
 {
 }
 
 bool wxDocument::DeleteContents()
 {

-    return TRUE;
+    return true;

 }
 
 wxDocument::~wxDocument()
 }
 
 wxDocument::~wxDocument()


@@ -165,16 +166,16 @@ bool wxDocument::Close()
     if (OnSaveModified())
         return OnCloseDocument();
     else
     if (OnSaveModified())
         return OnCloseDocument();
     else

-        return FALSE;
+        return false;

 }
 
 bool wxDocument::OnCloseDocument()
 {
     // Tell all views that we're about to close
 }
 
 bool wxDocument::OnCloseDocument()
 {
     // Tell all views that we're about to close

-    NotifyClosing();    
+    NotifyClosing();

     DeleteContents();
     DeleteContents();

-    Modify(FALSE);
-    return TRUE;
+    Modify(false);
+    return true;

 }
 
 // Note that this implicitly deletes the document when the last view is
 }
 
 // Note that this implicitly deletes the document when the last view is


@@ -182,25 +183,27 @@ bool wxDocument::OnCloseDocument()
 bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();
 bool wxDocument::DeleteAllViews()
 {
     wxDocManager* manager = GetDocumentManager();

+    wxList::iterator it, en;

 
 

-    wxNode *node = m_documentViews.GetFirst();
-    while (node)
+    for ( it = m_documentViews.begin(), en = m_documentViews.end();
+          it != en;
+          )

     {
     {

-        wxView *view = (wxView *)node->GetData();
+        wxView *view = (wxView *)*it;

         if (!view->Close())
         if (!view->Close())

-            return FALSE;
+            return false;

 
 

-        wxNode *next = node->GetNext();
+        wxList::iterator next = it; ++next;

 
         delete view; // Deletes node implicitly
 
         delete view; // Deletes node implicitly

-        node = next;
+        it = next;

     }
     // If we haven't yet deleted the document (for example
     // if there were no views) then delete it.
     if (manager && manager->GetDocuments().Member(this))
         delete this;
 
     }
     // If we haven't yet deleted the document (for example
     // if there were no views) then delete it.
     if (manager && manager->GetDocuments().Member(this))
         delete this;
 

-    return TRUE;
+    return true;

 }
 
 wxView *wxDocument::GetFirstView() const
 }
 
 wxView *wxDocument::GetFirstView() const


@@ -218,25 +221,25 @@ wxDocManager *wxDocument::GetDocumentManager() const
 bool wxDocument::OnNewDocument()
 {
     if (!OnSaveModified())
 bool wxDocument::OnNewDocument()
 {
     if (!OnSaveModified())

-        return FALSE;
+        return false;

 
 

-    if (OnCloseDocument()==FALSE) return FALSE;
+    if (OnCloseDocument()==false) return false;

     DeleteContents();
     DeleteContents();

-    Modify(FALSE);
-    SetDocumentSaved(FALSE);
+    Modify(false);
+    SetDocumentSaved(false);

 
     wxString name;
     GetDocumentManager()->MakeDefaultName(name);
     SetTitle(name);
 
     wxString name;
     GetDocumentManager()->MakeDefaultName(name);
     SetTitle(name);

-    SetFilename(name, TRUE);
+    SetFilename(name, true);

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::Save()
 {
     if (!IsModified() && m_savedYet)
 }
 
 bool wxDocument::Save()
 {
     if (!IsModified() && m_savedYet)

-        return TRUE;
+        return true;

 
     if ( m_documentFile.empty() || !m_savedYet )
         return SaveAs();
 
     if ( m_documentFile.empty() || !m_savedYet )
         return SaveAs();


@@ -248,18 +251,49 @@ bool wxDocument::SaveAs()
 {
     wxDocTemplate *docTemplate = GetDocumentTemplate();
     if (!docTemplate)
 {
     wxDocTemplate *docTemplate = GetDocumentTemplate();
     if (!docTemplate)

-        return FALSE;
+        return false;
+
+#if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
+    wxString filter = docTemplate->GetDescription() + wxT(" (") + docTemplate->GetFileFilter() + wxT(")|") + docTemplate->GetFileFilter();
+
+    // Now see if there are some other template with identical view and document
+    // classes, whose filters may also be used.
+
+    if (docTemplate->GetViewClassInfo() && docTemplate->GetDocClassInfo())
+    {
+        wxList::compatibility_iterator node = wxDocManager::GetDocumentManager()->GetTemplates().GetFirst();
+        while (node)
+        {
+            wxDocTemplate *t = (wxDocTemplate*) node->GetData();
+
+            if (t->IsVisible() && t != docTemplate &&
+                t->GetViewClassInfo() == docTemplate->GetViewClassInfo() &&
+                t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
+            {
+                // add a '|' to separate this filter from the previous one
+                if ( !filter.IsEmpty() )
+                    filter << wxT('|');

 
 

+                filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")
+                       << t->GetFileFilter();
+            }
+
+            node = node->GetNext();
+        }
+    }
+#else
+    wxString filter = docTemplate->GetFileFilter() ;
+#endif

     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
             wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),

-            docTemplate->GetFileFilter(),
+            filter,

             wxSAVE | wxOVERWRITE_PROMPT,
             GetDocumentWindow());
 
     if (tmp.IsEmpty())
             wxSAVE | wxOVERWRITE_PROMPT,
             GetDocumentWindow());
 
     if (tmp.IsEmpty())

-        return FALSE;
+        return false;

 
     wxString fileName(tmp);
     wxString path, name, ext;
 
     wxString fileName(tmp);
     wxString path, name, ext;


@@ -274,10 +308,8 @@ bool wxDocument::SaveAs()
     SetFilename(fileName);
     SetTitle(wxFileNameFromPath(fileName));
 
     SetFilename(fileName);
     SetTitle(wxFileNameFromPath(fileName));
 

-    GetDocumentManager()->AddFileToHistory(fileName);
-

     // Notify the views that the filename has changed
     // Notify the views that the filename has changed

-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
         wxView *view = (wxView *)node->GetData();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();


@@ -285,93 +317,57 @@ bool wxDocument::SaveAs()
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    return OnSaveDocument(m_documentFile);
+    // Files that were not saved correctly are not added to the FileHistory.
+    if (!OnSaveDocument(m_documentFile))
+        return false;
+
+   // A file that doesn't use the default extension of its document template cannot be opened
+   // via the FileHistory, so we do not add it.
+   if (docTemplate->FileMatchesTemplate(fileName))
+   {
+       GetDocumentManager()->AddFileToHistory(fileName);
+   }
+   else
+   {
+       // The user will probably not be able to open the file again, so
+       // we could warn about the wrong file-extension here.
+   }
+   return true;

 }
 
 bool wxDocument::OnSaveDocument(const wxString& file)
 {
     if ( !file )
 }
 
 bool wxDocument::OnSaveDocument(const wxString& file)
 {
     if ( !file )

-        return FALSE;
+        return false;

 
 

-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoSaveDocument(file) )
+        return false;

 
 

-#if wxUSE_STD_IOSTREAM
-    wxSTD ofstream store(file.mb_str());
-    if (store.fail() || store.bad())
-#else
-    wxFileOutputStream store(file);
-    if (store.GetLastError() != wxSTREAM_NO_ERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    if (!SaveObject(store))
-    {
-        (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        // Saving error
-        return FALSE;
-    }
-    Modify(FALSE);
+    Modify(false);

     SetFilename(file);
     SetFilename(file);

-    SetDocumentSaved(TRUE);
+    SetDocumentSaved(true);

 #ifdef __WXMAC__
     wxFileName fn(file) ;
     fn.MacSetDefaultTypeAndCreator() ;
 #endif
 #ifdef __WXMAC__
     wxFileName fn(file) ;
     fn.MacSetDefaultTypeAndCreator() ;
 #endif

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::OnOpenDocument(const wxString& file)
 {
     if (!OnSaveModified())
 }
 
 bool wxDocument::OnOpenDocument(const wxString& file)
 {
     if (!OnSaveModified())

-        return FALSE;
+        return false;

 
 

-    wxString msgTitle;
-    if (wxTheApp->GetAppName() != wxT(""))
-        msgTitle = wxTheApp->GetAppName();
-    else
-        msgTitle = wxString(_("File error"));
+    if ( !DoOpenDocument(file) )
+        return false;

 
 

-#if wxUSE_STD_IOSTREAM
-    wxSTD ifstream store(file.mb_str());
-    if (store.fail() || store.bad())
-#else
-    wxFileInputStream store(file);
-    if (store.GetLastError() != wxSTREAM_NO_ERROR)
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-#if wxUSE_STD_IOSTREAM
-    LoadObject(store);
-    if ( !store && !store.eof() )
-#else
-    int res = LoadObject(store).GetLastError();
-    if ((res != wxSTREAM_NO_ERROR) &&
-        (res != wxSTREAM_EOF))
-#endif
-    {
-        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
-                           GetDocumentWindow());
-        return FALSE;
-    }
-    SetFilename(file, TRUE);
-    Modify(FALSE);
-    m_savedYet = TRUE;
+    SetFilename(file, true);
+    Modify(false);
+    m_savedYet = true;

 
     UpdateAllViews();
 
 
     UpdateAllViews();
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 }
 
 #if wxUSE_STD_IOSTREAM


@@ -394,7 +390,7 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
 
 bool wxDocument::Revert()
 {

-    return FALSE;
+    return false;

 }
 
 
 }
 
 


@@ -404,17 +400,17 @@ bool wxDocument::GetPrintableName(wxString& buf) const
     if (m_documentTitle != wxT(""))
     {
         buf = m_documentTitle;
     if (m_documentTitle != wxT(""))
     {
         buf = m_documentTitle;

-        return TRUE;
+        return true;

     }
     else if (m_documentFile != wxT(""))
     {
         buf = wxFileNameFromPath(m_documentFile);
     }
     else if (m_documentFile != wxT(""))
     {
         buf = wxFileNameFromPath(m_documentFile);

-        return TRUE;
+        return true;

     }
     else
     {
         buf = _("unnamed");
     }
     else
     {
         buf = _("unnamed");

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -432,7 +428,7 @@ wxCommandProcessor *wxDocument::OnCreateCommandProcessor()
     return new wxCommandProcessor;
 }
 
     return new wxCommandProcessor;
 }
 

-// TRUE if safe to close
+// true if safe to close

 bool wxDocument::OnSaveModified()
 {
     if (IsModified())
 bool wxDocument::OnSaveModified()
 {
     if (IsModified())


@@ -454,20 +450,20 @@ bool wxDocument::OnSaveModified()
                 GetDocumentWindow());
         if (res == wxNO)
         {
                 GetDocumentWindow());
         if (res == wxNO)
         {

-            Modify(FALSE);
-            return TRUE;
+            Modify(false);
+            return true;

         }
         else if (res == wxYES)
             return Save();
         else if (res == wxCANCEL)
         }
         else if (res == wxYES)
             return Save();
         else if (res == wxCANCEL)

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::Draw(wxDC& WXUNUSED(context))
 {
 }
 
 bool wxDocument::Draw(wxDC& WXUNUSED(context))
 {

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::AddView(wxView *view)
 }
 
 bool wxDocument::AddView(wxView *view)


@@ -477,22 +473,22 @@ bool wxDocument::AddView(wxView *view)
         m_documentViews.Append(view);
         OnChangedViewList();
     }
         m_documentViews.Append(view);
         OnChangedViewList();
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
     (void)m_documentViews.DeleteObject(view);
     OnChangedViewList();
 }
 
 bool wxDocument::RemoveView(wxView *view)
 {
     (void)m_documentViews.DeleteObject(view);
     OnChangedViewList();

-    return TRUE;
+    return true;

 }
 
 bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 {
     if (GetDocumentTemplate()->CreateView(this, flags))
 }
 
 bool wxDocument::OnCreate(const wxString& WXUNUSED(path), long flags)
 {
     if (GetDocumentTemplate()->CreateView(this, flags))

-        return TRUE;
+        return true;

     else
     else

-        return FALSE;
+        return false;

 }
 
 // Called after a view is added or removed.
 }
 
 // Called after a view is added or removed.


@@ -511,11 +507,11 @@ void wxDocument::OnChangedViewList()
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {
 
 void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 {

-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
         wxView *view = (wxView *)node->GetData();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();

-               if (view != sender)
+        if (view != sender)

             view->OnUpdate(sender, hint);
         node = node->GetNext();
     }
             view->OnUpdate(sender, hint);
         node = node->GetNext();
     }


@@ -523,7 +519,7 @@ void wxDocument::UpdateAllViews(wxView *sender, wxObject *hint)
 
 void wxDocument::NotifyClosing()
 {
 
 void wxDocument::NotifyClosing()
 {

-    wxNode *node = m_documentViews.GetFirst();
+    wxList::compatibility_iterator node = m_documentViews.GetFirst();

     while (node)
     {
         wxView *view = (wxView *)node->GetData();
     while (node)
     {
         wxView *view = (wxView *)node->GetData();


@@ -538,7 +534,7 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     if ( notifyViews )
     {
         // Notify the views that the filename has changed
     if ( notifyViews )
     {
         // Notify the views that the filename has changed

-        wxNode *node = m_documentViews.GetFirst();
+        wxList::compatibility_iterator node = m_documentViews.GetFirst();

         while (node)
         {
             wxView *view = (wxView *)node->GetData();
         while (node)
         {
             wxView *view = (wxView *)node->GetData();


@@ -548,22 +544,90 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     }
 }
 
     }
 }
 

+bool wxDocument::DoSaveDocument(const wxString& file)
+{
+    wxString msgTitle;
+    if (wxTheApp->GetAppName() != wxT(""))
+        msgTitle = wxTheApp->GetAppName();
+    else
+        msgTitle = wxString(_("File error"));
+
+#if wxUSE_STD_IOSTREAM
+    wxSTD ofstream store(file.mb_str());
+    if (store.fail() || store.bad())
+#else
+    wxFileOutputStream store(file);
+    if (store.GetLastError() != wxSTREAM_NO_ERROR)
+#endif
+    {
+        (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
+                           GetDocumentWindow());
+        // Saving error
+        return false;
+    }
+    if (!SaveObject(store))
+    {
+        (void)wxMessageBox(_("Sorry, could not save this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
+                           GetDocumentWindow());
+        // Saving error
+        return false;
+    }
+
+    return true;
+}
+
+bool wxDocument::DoOpenDocument(const wxString& file)
+{
+    wxString msgTitle;
+    if (wxTheApp->GetAppName() != wxT(""))
+        msgTitle = wxTheApp->GetAppName();
+    else
+        msgTitle = wxString(_("File error"));
+
+#if wxUSE_STD_IOSTREAM
+    wxSTD ifstream store(file.mb_str());
+    if (store.fail() || store.bad())
+#else
+    wxFileInputStream store(file);
+    if (store.GetLastError() != wxSTREAM_NO_ERROR)
+#endif
+    {
+        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
+                           GetDocumentWindow());
+        return false;
+    }
+#if wxUSE_STD_IOSTREAM
+    LoadObject(store);
+    if ( !store && !store.eof() )
+#else
+    int res = LoadObject(store).GetLastError();
+    if ((res != wxSTREAM_NO_ERROR) &&
+        (res != wxSTREAM_EOF))
+#endif
+    {
+        (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
+                           GetDocumentWindow());
+        return false;
+    }
+
+    return true;
+}
+
+

 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------
 
 wxView::wxView()
 {
 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------
 
 wxView::wxView()
 {

-    //  SetDocument(doc);

     m_viewDocument = (wxDocument*) NULL;
 
     m_viewDocument = (wxDocument*) NULL;
 

-    m_viewTypeName = wxT("");

     m_viewFrame = (wxFrame *) NULL;
 }
 
 wxView::~wxView()
 {
     m_viewFrame = (wxFrame *) NULL;
 }
 
 wxView::~wxView()
 {

-//    GetDocumentManager()->ActivateView(this, FALSE, TRUE);
+    GetDocumentManager()->ActivateView(this, false);

     m_viewDocument->RemoveView(this);
 }
 
     m_viewDocument->RemoveView(this);
 }
 


@@ -572,8 +636,8 @@ bool wxView::ProcessEvent(wxEvent& event)
 {
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);
 {
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);

-    else
-        return TRUE;
+
+    return true;

 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))
 }
 
 void wxView::OnActivateView(bool WXUNUSED(activate), wxView *WXUNUSED(activeView), wxView *WXUNUSED(deactiveView))


@@ -611,9 +675,9 @@ void wxView::SetDocument(wxDocument *doc)
 bool wxView::Close(bool deleteWindow)
 {
     if (OnClose(deleteWindow))
 bool wxView::Close(bool deleteWindow)
 {
     if (OnClose(deleteWindow))

-        return TRUE;
+        return true;

     else
     else

-        return FALSE;
+        return false;

 }
 
 void wxView::Activate(bool activate)
 }
 
 void wxView::Activate(bool activate)


@@ -627,7 +691,7 @@ void wxView::Activate(bool activate)
 
 bool wxView::OnClose(bool WXUNUSED(deleteWindow))
 {
 
 bool wxView::OnClose(bool WXUNUSED(deleteWindow))
 {

-    return GetDocument() ? GetDocument()->Close() : TRUE;
+    return GetDocument() ? GetDocument()->Close() : true;

 }
 
 #if wxUSE_PRINTING_ARCHITECTURE
 }
 
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -674,29 +738,43 @@ wxDocTemplate::~wxDocTemplate()
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {
 // Tries to dynamically construct an object of the right class.
 wxDocument *wxDocTemplate::CreateDocument(const wxString& path, long flags)
 {

-    if (!m_docClassInfo)
+    wxDocument *doc = DoCreateDocument();
+    if ( doc == NULL )
+        return (wxDocument *) NULL;
+
+    if (InitDocument(doc, path, flags))
+    {
+        return doc;
+    }
+    else
+    {

         return (wxDocument *) NULL;
         return (wxDocument *) NULL;

-    wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+    }
+}
+
+bool wxDocTemplate::InitDocument(wxDocument* doc, const wxString& path, long flags)
+{

     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     if (doc->OnCreate(path, flags))
     doc->SetFilename(path);
     doc->SetDocumentTemplate(this);
     GetDocumentManager()->AddDocument(doc);
     doc->SetCommandProcessor(doc->OnCreateCommandProcessor());
 
     if (doc->OnCreate(path, flags))

-        return doc;
+        return true;

     else
     {
         if (GetDocumentManager()->GetDocuments().Member(doc))
             doc->DeleteAllViews();
     else
     {
         if (GetDocumentManager()->GetDocuments().Member(doc))
             doc->DeleteAllViews();

-        return (wxDocument *) NULL;
+        return false;

     }
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 {
     }
 }
 
 wxView *wxDocTemplate::CreateView(wxDocument *doc, long flags)
 {

-    if (!m_viewClassInfo)
+    wxView *view = DoCreateView();
+    if ( view == NULL )

         return (wxView *) NULL;
         return (wxView *) NULL;

-    wxView *view = (wxView *)m_viewClassInfo->CreateObject();
+

     view->SetDocument(doc);
     if (view->OnCreate(doc, flags))
     {
     view->SetDocument(doc);
     if (view->OnCreate(doc, flags))
     {


@@ -716,6 +794,22 @@ bool wxDocTemplate::FileMatchesTemplate(const wxString& path)
     return GetDefaultExtension().IsSameAs(FindExtension(path));
 }
 
     return GetDefaultExtension().IsSameAs(FindExtension(path));
 }
 

+wxDocument *wxDocTemplate::DoCreateDocument()
+{
+    if (!m_docClassInfo)
+        return (wxDocument *) NULL;
+
+    return (wxDocument *)m_docClassInfo->CreateObject();
+}
+
+wxView *wxDocTemplate::DoCreateView()
+{
+    if (!m_viewClassInfo)
+        return (wxView *) NULL;
+
+    return (wxView *)m_viewClassInfo->CreateObject();
+}
+

 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDocManager
 // ----------------------------------------------------------------------------


@@ -786,51 +880,51 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
         // Check we're really deleted
         if (m_docs.Member(doc))
             delete doc;
         // Check we're really deleted
         if (m_docs.Member(doc))
             delete doc;

-        
-        return TRUE;
+
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxDocManager::CloseDocuments(bool force)
 {
 }
 
 bool wxDocManager::CloseDocuments(bool force)
 {

-    wxNode *node = m_docs.GetFirst();
+    wxList::compatibility_iterator node = m_docs.GetFirst();

     while (node)
     {
         wxDocument *doc = (wxDocument *)node->GetData();
     while (node)
     {
         wxDocument *doc = (wxDocument *)node->GetData();

-        wxNode *next = node->GetNext();
-        
+        wxList::compatibility_iterator next = node->GetNext();
+

         if (!CloseDocument(doc, force))
         if (!CloseDocument(doc, force))

-            return FALSE;
+            return false;

 
         // This assumes that documents are not connected in
         // any way, i.e. deleting one document does NOT
         // delete another.
         node = next;
     }
 
         // This assumes that documents are not connected in
         // any way, i.e. deleting one document does NOT
         // delete another.
         node = next;
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocManager::Clear(bool force)
 {
     if (!CloseDocuments(force))
 }
 
 bool wxDocManager::Clear(bool force)
 {
     if (!CloseDocuments(force))

-        return FALSE;
+        return false;

 
 

-    wxNode *node = m_templates.GetFirst();
+    wxList::compatibility_iterator node = m_templates.GetFirst();

     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->GetData();
     while (node)
     {
         wxDocTemplate *templ = (wxDocTemplate*) node->GetData();

-        wxNode* next = node->GetNext();
+        wxList::compatibility_iterator next = node->GetNext();

         delete templ;
         node = next;
     }
         delete templ;
         node = next;
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocManager::Initialize()
 {
     m_fileHistory = OnCreateFileHistory();
 }
 
 bool wxDocManager::Initialize()
 {
     m_fileHistory = OnCreateFileHistory();

-    return TRUE;
+    return true;

 }
 
 wxFileHistory *wxDocManager::OnCreateFileHistory()
 }
 
 wxFileHistory *wxDocManager::OnCreateFileHistory()


@@ -853,7 +947,7 @@ void wxDocManager::OnFileClose(wxCommandEvent& WXUNUSED(event))
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 {

-    CloseDocuments(FALSE);
+    CloseDocuments(false);

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


@@ -904,7 +998,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         wxPrinter printer;
     if (printout)
     {
         wxPrinter printer;

-        printer.Print(view->GetFrame(), printout, TRUE);
+        printer.Print(view->GetFrame(), printout, true);

 
         delete printout;
     }
 
         delete printout;
     }


@@ -922,7 +1016,7 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
     wxPrintDialogData data;
 
     wxPrintDialog printerDialog(parentWin, &data);
     wxPrintDialogData data;
 
     wxPrintDialog printerDialog(parentWin, &data);

-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
+    printerDialog.GetPrintDialogData().SetSetupDialog(true);

     printerDialog.ShowModal();
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
     printerDialog.ShowModal();
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }


@@ -938,41 +1032,50 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.
     if (printout)
     {
         // Pass two printout objects: for preview, and possible printing.

-        wxPrintPreviewBase *preview = (wxPrintPreviewBase *) NULL;
-        preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());
+        if ( !preview->Ok() )
+        {
+            delete preview;
+            wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
+            return;
+        }

 
         wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                 wxPoint(100, 100), wxSize(600, 650));
         frame->Centre(wxBOTH);
         frame->Initialize();
 
         wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
                 wxPoint(100, 100), wxSize(600, 650));
         frame->Centre(wxBOTH);
         frame->Initialize();

-        frame->Show(TRUE);
+        frame->Show(true);

     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 

-void wxDocManager::OnUndo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnUndo(wxCommandEvent& event)

 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Undo();
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Undo();

+    else
+        event.Skip();

 }
 
 }
 

-void wxDocManager::OnRedo(wxCommandEvent& WXUNUSED(event))
+void wxDocManager::OnRedo(wxCommandEvent& event)

 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Redo();
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
         return;
     if (doc->GetCommandProcessor())
         doc->GetCommandProcessor()->Redo();

+    else
+        event.Skip();

 }
 
 // Handlers for UI update commands
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {
 }
 
 // Handlers for UI update commands
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {

-    event.Enable( TRUE );
+    event.Enable( true );

 }
 
 void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)
 }
 
 void wxDocManager::OnUpdateFileClose(wxUpdateUIEvent& event)


@@ -989,7 +1092,7 @@ void wxDocManager::OnUpdateFileRevert(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {
 
 void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 {

-    event.Enable( TRUE );
+    event.Enable( true );

 }
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 }
 
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)


@@ -1007,17 +1110,29 @@ void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
 void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();

-    event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) );
-    if (doc && doc->GetCommandProcessor())
+    if (!doc)
+        event.Enable(false);
+    else if (!doc->GetCommandProcessor())
+        event.Skip();
+    else
+    {
+        event.Enable( doc->GetCommandProcessor()->CanUndo() );

         doc->GetCommandProcessor()->SetMenuStrings();
         doc->GetCommandProcessor()->SetMenuStrings();

+    }

 }
 
 void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
 }
 
 void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();

-    event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) );
-    if (doc && doc->GetCommandProcessor())
+    if (!doc)
+        event.Enable(false);
+    else if (!doc->GetCommandProcessor())
+        event.Skip();
+    else
+    {
+        event.Enable( doc->GetCommandProcessor()->CanRedo() );

         doc->GetCommandProcessor()->SetMenuStrings();
         doc->GetCommandProcessor()->SetMenuStrings();

+    }

 }
 
 void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
 }
 
 void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)


@@ -1028,7 +1143,7 @@ void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
 
 void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
 {
 
 void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
 {

-    event.Enable( TRUE );
+    event.Enable( true );

 }
 
 void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)
 }
 
 void wxDocManager::OnUpdatePreview(wxUpdateUIEvent& event)


@@ -1056,7 +1171,7 @@ bool wxDocManager::ProcessEvent(wxEvent& event)
     if (view)
     {
         if (view->ProcessEvent(event))
     if (view)
     {
         if (view->ProcessEvent(event))

-            return TRUE;
+            return true;

     }
     return wxEvtHandler::ProcessEvent(event);
 }
     }
     return wxEvtHandler::ProcessEvent(event);
 }


@@ -1080,7 +1195,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         delete[] templates;
         return (wxDocument *) NULL;
     }
         delete[] templates;
         return (wxDocument *) NULL;
     }

-    
+

     wxDocument* docToClose = NULL;
 
     // If we've reached the max number of docs, close the
     wxDocument* docToClose = NULL;
 
     // If we've reached the max number of docs, close the


@@ -1098,16 +1213,17 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         {
             if (docToClose)
             {
         {
             if (docToClose)
             {

-                if (!CloseDocument(docToClose, FALSE))
+                if (!CloseDocument(docToClose, false))

                 {
                 {

+                    delete[] templates;

                     return NULL;
                 }
             }
                     return NULL;
                 }
             }

-            
+

             wxDocTemplate *temp = templates[0];
             delete[] templates;
             wxDocument *newDoc = temp->CreateDocument(path, flags);
             wxDocTemplate *temp = templates[0];
             delete[] templates;
             wxDocument *newDoc = temp->CreateDocument(path, flags);

-            
+

             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
             if (newDoc)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());


@@ -1123,12 +1239,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         {
             if (docToClose)
             {
         {
             if (docToClose)
             {

-                if (!CloseDocument(docToClose, FALSE))
+                if (!CloseDocument(docToClose, false))

                 {
                     return NULL;
                 }
             }
                 {
                     return NULL;
                 }
             }

-            
+

             wxDocument *newDoc = temp->CreateDocument(path, flags);
 
             if (newDoc)
             wxDocument *newDoc = temp->CreateDocument(path, flags);
 
             if (newDoc)


@@ -1144,14 +1260,24 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     }
 
     // Existing document
     }
 
     // Existing document

-    wxDocTemplate *temp = (wxDocTemplate *) NULL;
+    wxDocTemplate *temp;

 
     wxString path2(wxT(""));
     if (path != wxT(""))
         path2 = path;
 
     if (flags & wxDOC_SILENT)
 
     wxString path2(wxT(""));
     if (path != wxT(""))
         path2 = path;
 
     if (flags & wxDOC_SILENT)

+    {

         temp = FindTemplateForPath(path2);
         temp = FindTemplateForPath(path2);

+        if (!temp)
+        {
+            // Since we do not add files with non-default extensions to the FileHistory this
+            // can only happen if the application changes the allowed templates in runtime.
+            (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
+                                _("Open File"),
+                               wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+        }
+    }

     else
         temp = SelectDocumentPath(templates, n, path2, flags);
 
     else
         temp = SelectDocumentPath(templates, n, path2, flags);
 


@@ -1161,12 +1287,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     {
         if (docToClose)
         {
     {
         if (docToClose)
         {

-            if (!CloseDocument(docToClose, FALSE))
+            if (!CloseDocument(docToClose, false))

             {
                 return NULL;
             }
         }
             {
                 return NULL;
             }
         }

-        
+

         wxDocument *newDoc = temp->CreateDocument(path2, flags);
         if (newDoc)
         {
         wxDocument *newDoc = temp->CreateDocument(path2, flags);
         if (newDoc)
         {


@@ -1178,7 +1304,11 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
                 // delete newDoc; // Implicitly deleted by DeleteAllViews
                 return (wxDocument *) NULL;
             }
                 // delete newDoc; // Implicitly deleted by DeleteAllViews
                 return (wxDocument *) NULL;
             }

-            AddFileToHistory(path2);
+            // A file that doesn't use the default extension of its document
+            // template cannot be opened via the FileHistory, so we do not
+            // add it.
+            if (temp->FileMatchesTemplate(path2))
+                AddFileToHistory(path2);

         }
         return newDoc;
     }
         }
         return newDoc;
     }


@@ -1239,7 +1369,7 @@ void wxDocManager::DeleteTemplate(wxDocTemplate *WXUNUSED(temp), long WXUNUSED(f
 // Not yet implemented
 bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 {
 // Not yet implemented
 bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 {

-    return FALSE;
+    return false;

 }
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 }
 
 wxDocument *wxDocManager::GetCurrentDocument() const


@@ -1257,7 +1387,7 @@ bool wxDocManager::MakeDefaultName(wxString& name)
     name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
     m_defaultDocumentNameCounter++;
 
     name.Printf(_("unnamed%d"), m_defaultDocumentNameCounter);
     m_defaultDocumentNameCounter++;
 

-    return TRUE;
+    return true;

 }
 
 // Make a frame title (override this to do something different)
 }
 
 // Make a frame title (override this to do something different)


@@ -1345,12 +1475,9 @@ void wxDocManager::FileHistoryAddFilesToMenu()
         m_fileHistory->AddFilesToMenu();
 }
 
         m_fileHistory->AddFilesToMenu();
 }
 

-size_t wxDocManager::GetNoHistoryFiles() const
+size_t wxDocManager::GetHistoryFilesCount() const

 {
 {

-    if (m_fileHistory)
-        return m_fileHistory->GetNoHistoryFiles();
-    else
-        return 0;
+    return m_fileHistory ? m_fileHistory->GetCount() : 0;

 }
 
 
 }
 
 


@@ -1396,9 +1523,8 @@ static wxWindow* wxFindSuitableParent()
 }
 
 // Prompts user to open a file, using file specs in templates.
 }
 
 // Prompts user to open a file, using file specs in templates.

-// How to implement in wxWindows? Must extend the file selector
-// dialog or implement own; OR match the extension to the
-// template extension.
+// Must extend the file selector dialog or implement own; OR
+// match the extension to the template extension.

 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 #if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)
 
 wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 #if defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXMAC__)


@@ -1471,6 +1597,14 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             theTemplate = templates[FilterIndex];
         if ( !theTemplate )
             theTemplate = FindTemplateForPath(path);
             theTemplate = templates[FilterIndex];
         if ( !theTemplate )
             theTemplate = FindTemplateForPath(path);

+        if ( !theTemplate )
+        {
+            // Since we do not add files with non-default extensions to the FileHistory this
+            // can only happen if the application changes the allowed templates in runtime.
+            (void)wxMessageBox(_("Sorry, the format for this file is unknown."),
+                                _("Open File"),
+                                wxOK | wxICON_EXCLAMATION, wxFindSuitableParent());
+        }

     }
     else
     {
     }
     else
     {


@@ -1478,78 +1612,57 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
 
     return theTemplate;
     }
 
     return theTemplate;

-
-#if 0
-    // In all other windowing systems, until we have more advanced
-    // file selectors, we must select the document type (template) first, and
-    // _then_ pop up the file selector.
-    wxDocTemplate *temp = SelectDocumentType(templates, noTemplates);
-    if (!temp)
-        return (wxDocTemplate *) NULL;
-
-    wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""),
-            temp->GetDefaultExtension(),
-            temp->GetFileFilter(),
-            0, wxTheApp->GetTopWindow());
-
-    if (pathTmp)
-    {
-        path = pathTmp;
-        return temp;
-    }
-    else
-        return (wxDocTemplate *) NULL;
-#endif // 0

 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {
 }
 
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates, bool sort)
 {

-    wxArrayString strings(sort);
+    wxArrayString strings;

     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;

-        
-       for (i = 0; i < noTemplates; i++)
-       {
-               if (templates[i]->IsVisible())
-               {
-               int j;
-            bool want = TRUE;
-                       for (j = 0; j < n; j++)
-                       {
+
+    for (i = 0; i < noTemplates; i++)
+    {
+        if (templates[i]->IsVisible())
+        {
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {

                 //filter out NOT unique documents + view combinations
                 //filter out NOT unique documents + view combinations

-                               if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
+                if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&

                      templates[i]->m_viewTypeName == data[j]->m_viewTypeName
                    )
                      templates[i]->m_viewTypeName == data[j]->m_viewTypeName
                    )

-                    want = FALSE;
-                       }
+                    want = false;
+            }

 
             if ( want )
 
             if ( want )

-                       {
-                       strings.Add(templates[i]->m_description);
-
-                               data[n] = templates[i];
-                               n ++;
-                       }
-               }
-       }  // for
-
-       if (sort)
-       {
-               // Yes, this will be slow, but template lists
-               // are typically short.
-               int j;
-               n = strings.Count();
-               for (i = 0; i < n; i++)
-               {
-                       for (j = 0; j < noTemplates; j++)
-                       {
-                               if (strings[i] == templates[j]->m_description)
-                                       data[i] = templates[j];
-                       }
-               }
-       }
+            {
+                strings.Add(templates[i]->m_description);
+
+                data[n] = templates[i];
+                n ++;
+            }
+        }
+    }  // for
+
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_description)
+                    data[i] = templates[j];
+            }
+        }
+    }

 
     wxDocTemplate *theTemplate;
 
 
     wxDocTemplate *theTemplate;
 


@@ -1585,49 +1698,50 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
                                             int noTemplates, bool sort)
 {

-    wxArrayString strings(sort);
+    wxArrayString strings;

     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;

-        
+

     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {

-               int j;
-            bool want = TRUE;
-                       for (j = 0; j < n; j++)
-                       {
+            int j;
+            bool want = true;
+            for (j = 0; j < n; j++)
+            {

                 //filter out NOT unique views
                 //filter out NOT unique views

-                               if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
-                    want = FALSE;
-                       }
+                if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+                    want = false;
+            }

 
             if ( want )
             {
 
             if ( want )
             {

-                       strings.Add(templ->m_viewTypeName);
-                               data[n] = templ;
-                               n ++;
-                       }
+                strings.Add(templ->m_viewTypeName);
+                data[n] = templ;
+                n ++;
+            }

         }
     }
 
         }
     }
 

-       if (sort)
-       {
-               // Yes, this will be slow, but template lists
-               // are typically short.
-               int j;
-               n = strings.Count();
-               for (i = 0; i < n; i++)
-               {
-                       for (j = 0; j < noTemplates; j++)
-                       {
-                               if (strings[i] == templates[j]->m_viewTypeName)
-                                       data[i] = templates[j];
-                       }
-               }
-       }
+    if (sort)
+    {
+        strings.Sort(); // ascending sort
+        // Yes, this will be slow, but template lists
+        // are typically short.
+        int j;
+        n = strings.Count();
+        for (i = 0; i < n; i++)
+        {
+            for (j = 0; j < noTemplates; j++)
+            {
+                if (strings[i] == templates[j]->m_viewTypeName)
+                    data[i] = templates[j];
+            }
+        }
+    }

 
     wxDocTemplate *theTemplate;
 
 
     wxDocTemplate *theTemplate;
 


@@ -1683,25 +1797,19 @@ void wxDocManager::RemoveDocument(wxDocument *doc)
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus
 
 // Views or windows should inform the document manager
 // when a view is going in or out of focus

-void wxDocManager::ActivateView(wxView *view, bool activate, bool WXUNUSED(deleting))
-{
-    // If we're deactiving, and if we're not actually deleting the view, then
-    // don't reset the current view because we may be going to
-    // a window without a view.
-    // WHAT DID I MEAN BY THAT EXACTLY?
-    /*
-       if (deleting)
-       {
-       if (m_currentView == view)
-       m_currentView = NULL;
-       }
-       else
-     */
-    {
-        if (activate)
-            m_currentView = view;
-        else
+void wxDocManager::ActivateView(wxView *view, bool activate)
+{
+    if ( activate )
+    {
+        m_currentView = view;
+    }
+    else // deactivate
+    {
+        if ( m_currentView == view )
+        {
+            // don't keep stale pointer

             m_currentView = (wxView *) NULL;
             m_currentView = (wxView *) NULL;

+        }

     }
 }
 
     }
 }
 


@@ -1739,7 +1847,7 @@ wxDocChildFrame::~wxDocChildFrame()
 bool wxDocChildFrame::ProcessEvent(wxEvent& event)
 {
     if (m_childView)
 bool wxDocChildFrame::ProcessEvent(wxEvent& event)
 {
     if (m_childView)

-        m_childView->Activate(TRUE);
+        m_childView->Activate(true);

 
     if ( !m_childView || ! m_childView->ProcessEvent(event) )
     {
 
     if ( !m_childView || ! m_childView->ProcessEvent(event) )
     {


@@ -1747,10 +1855,10 @@ bool wxDocChildFrame::ProcessEvent(wxEvent& event)
         if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
             return wxEvtHandler::ProcessEvent(event);
         else
         if (!event.IsKindOf(CLASSINFO(wxCommandEvent)) || !GetParent() || !GetParent()->ProcessEvent(event))
             return wxEvtHandler::ProcessEvent(event);
         else

-            return TRUE;
+            return true;

     }
     else
     }
     else

-        return TRUE;
+        return true;

 }
 
 void wxDocChildFrame::OnActivate(wxActivateEvent& event)
 }
 
 void wxDocChildFrame::OnActivate(wxActivateEvent& event)


@@ -1765,15 +1873,13 @@ void wxDocChildFrame::OnCloseWindow(wxCloseEvent& event)
 {
     if (m_childView)
     {
 {
     if (m_childView)
     {

-        bool ans = FALSE;
-        if (!event.CanVeto())
-            ans = TRUE; // Must delete.
-        else
-            ans = m_childView->Close(FALSE); // FALSE means don't delete associated window
+        bool ans = event.CanVeto()
+                    ? m_childView->Close(false) // false means don't delete associated window
+                    : true; // Must delete.

 
         if (ans)
         {
 
         if (ans)
         {

-            m_childView->Activate(FALSE);
+            m_childView->Activate(false);

             delete m_childView;
             m_childView = (wxView *) NULL;
             m_childDocument = (wxDocument *) NULL;
             delete m_childView;
             m_childView = (wxView *) NULL;
             m_childDocument = (wxDocument *) NULL;


@@ -1825,7 +1931,14 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
         if ( wxFile::Exists(filename) )
         {
             // try to open it
         if ( wxFile::Exists(filename) )
         {
             // try to open it

-            (void)m_docManager->CreateDocument(filename, wxDOC_SILENT);
+            if (!m_docManager->CreateDocument(filename, wxDOC_SILENT))
+            {
+                // remove the file from the MRU list. The user should already be notified.
+                m_docManager->RemoveFileFromHistory(n);
+
+                wxLogError(_("The file '%s' couldn't be opened.\nIt has been removed from the most recently used files list."),
+                       filename.c_str());
+            }

         }
         else
         {
         }
         else
         {


@@ -1846,7 +1959,7 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
     if (!m_docManager || !m_docManager->ProcessEvent(event))
         return wxEvtHandler::ProcessEvent(event);
     else
     if (!m_docManager || !m_docManager->ProcessEvent(event))
         return wxEvtHandler::ProcessEvent(event);
     else

-        return TRUE;
+        return true;

 }
 
 // Define the behaviour for the frame closing
 }
 
 // Define the behaviour for the frame closing


@@ -1876,8 +1989,10 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);
     // Get the logical pixels per inch of screen and printer
     int ppiScreenX, ppiScreenY;
     GetPPIScreen(&ppiScreenX, &ppiScreenY);

+    wxUnusedVar(ppiScreenY);

     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
     int ppiPrinterX, ppiPrinterY;
     GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);

+    wxUnusedVar(ppiPrinterY);

 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size
 
     // This scales the DC so that the printout roughly represents the
     // the screen scaling. The text point size _should_ be the right size


@@ -1892,6 +2007,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);
     int w, h;
     dc->GetSize(&w, &h);
     GetPageSizePixels(&pageWidth, &pageHeight);

+    wxUnusedVar(pageHeight);

 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.
 
     // If printer pageWidth == current DC width, then this doesn't
     // change. But w might be the preview bitmap width, so scale down.


@@ -1902,7 +2018,7 @@ bool wxDocPrintout::OnPrintPage(int WXUNUSED(page))
     {
         m_printoutView->OnDraw(dc);
     }
     {
         m_printoutView->OnDraw(dc);
     }

-    return TRUE;
+    return true;

 }
 
 bool wxDocPrintout::HasPage(int pageNum)
 }
 
 bool wxDocPrintout::HasPage(int pageNum)


@@ -1913,9 +2029,9 @@ bool wxDocPrintout::HasPage(int pageNum)
 bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))
 bool wxDocPrintout::OnBeginDocument(int startPage, int endPage)
 {
     if (!wxPrintout::OnBeginDocument(startPage, endPage))

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
 }
 
 void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)


@@ -1932,6 +2048,18 @@ void wxDocPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, in
 // File history processor
 // ----------------------------------------------------------------------------
 
 // File history processor
 // ----------------------------------------------------------------------------
 

+static inline wxChar* MYcopystring(const wxString& s)
+{
+    wxChar* copy = new wxChar[s.length() + 1];
+    return wxStrcpy(copy, s.c_str());
+}
+
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+

 wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
 {
     m_fileMaxFiles = maxFiles;
 wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase)
 {
     m_fileMaxFiles = maxFiles;


@@ -1956,7 +2084,14 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     // Check we don't already have this file
     for (i = 0; i < m_fileHistoryN; i++)
     {
     // Check we don't already have this file
     for (i = 0; i < m_fileHistoryN; i++)
     {

-        if ( m_fileHistory[i] && (file == m_fileHistory[i]) )
+#if defined( __WXMSW__ ) // Add any other OSes with case insensitive file names
+        wxString testString;
+        if ( m_fileHistory[i] )
+            testString = m_fileHistory[i];
+        if ( m_fileHistory[i] && ( file.Lower() == testString.Lower() ) )
+#else
+        if ( m_fileHistory[i] && ( file == m_fileHistory[i] ) )
+#endif

         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory (i);
         {
             // we do have it, move it to the top of the history
             RemoveFileFromHistory (i);


@@ -1977,7 +2112,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {
     // Move existing files (if any) down so we can insert file at beginning.
     if (m_fileHistoryN < m_fileMaxFiles)
     {

-        wxNode* node = m_fileMenus.GetFirst();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();

         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();


@@ -1995,7 +2130,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
     {
         m_fileHistory[i] = m_fileHistory[i-1];
     }
     {
         m_fileHistory[i] = m_fileHistory[i-1];
     }

-    m_fileHistory[0] = copystring(file);
+    m_fileHistory[0] = MYcopystring(file);

 
     // this is the directory of the last opened file
     wxString pathCurrent;
 
     // this is the directory of the last opened file
     wxString pathCurrent;


@@ -2022,7 +2157,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());
 
             wxString buf;
             buf.Printf(s_MRUEntryFormat, i + 1, pathInMenu.c_str());

-            wxNode* node = m_fileMenus.GetFirst();
+            wxList::compatibility_iterator node = m_fileMenus.GetFirst();

             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->GetData();
             while (node)
             {
                 wxMenu* menu = (wxMenu*) node->GetData();


@@ -2047,12 +2182,11 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
         m_fileHistory[j] = m_fileHistory[j + 1];
     }
 
         m_fileHistory[j] = m_fileHistory[j + 1];
     }
 

-    wxNode* node = m_fileMenus.GetFirst();
+    wxList::compatibility_iterator node = m_fileMenus.GetFirst();

     while ( node )
     {
          wxMenu* menu = (wxMenu*) node->GetData();
 
     while ( node )
     {
          wxMenu* menu = (wxMenu*) node->GetData();
 

-

          // shuffle filenames up
          wxString buf;
          for ( j = i; j < m_fileHistoryN - 1; j++ )
          // shuffle filenames up
          wxString buf;
          for ( j = i; j < m_fileHistoryN - 1; j++ )


@@ -2073,7 +2207,7 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {
         // delete the last separator too if no more files are left
         if ( m_fileHistoryN == 1 )
         {

-            wxMenuItemList::Node *node = menu->GetMenuItems().GetLast();
+            wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetLast();

             if ( node )
             {
                 wxMenuItem *menuItem = node->GetData();
             if ( node )
             {
                 wxMenuItem *menuItem = node->GetData();


@@ -2125,7 +2259,7 @@ void wxFileHistory::Load(wxConfigBase& config)
     wxString historyFile;
     while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
     {
     wxString historyFile;
     while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
     {

-        m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
+        m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);

         m_fileHistoryN ++;
         buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
         historyFile = wxT("");
         m_fileHistoryN ++;
         buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
         historyFile = wxT("");


@@ -2136,11 +2270,14 @@ void wxFileHistory::Load(wxConfigBase& config)
 void wxFileHistory::Save(wxConfigBase& config)
 {
     size_t i;
 void wxFileHistory::Save(wxConfigBase& config)
 {
     size_t i;

-    for (i = 0; i < m_fileHistoryN; i++)
+    for (i = 0; i < m_fileMaxFiles; i++)

     {
         wxString buf;
         buf.Printf(wxT("file%d"), (int)i+1);
     {
         wxString buf;
         buf.Printf(wxT("file%d"), (int)i+1);

-        config.Write(buf, wxString(m_fileHistory[i]));
+        if (i < m_fileHistoryN)
+            config.Write(buf, wxString(m_fileHistory[i]));
+        else
+            config.Write(buf, wxEmptyString);

     }
 }
 #endif // wxUSE_CONFIG
     }
 }
 #endif // wxUSE_CONFIG


@@ -2149,7 +2286,7 @@ void wxFileHistory::AddFilesToMenu()
 {
     if (m_fileHistoryN > 0)
     {
 {
     if (m_fileHistoryN > 0)
     {

-        wxNode* node = m_fileMenus.GetFirst();
+        wxList::compatibility_iterator node = m_fileMenus.GetFirst();

         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();
         while (node)
         {
             wxMenu* menu = (wxMenu*) node->GetData();


@@ -2206,7 +2343,7 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
 
 
     char buf[4096];
 


@@ -2215,22 +2352,22 @@ bool wxTransferFileToStream(const wxString& filename, wxSTD ostream& stream)
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )

-            return FALSE;
+            return false;

 
         stream.write(buf, nRead);
         if ( !stream )
 
         stream.write(buf, nRead);
         if ( !stream )

-            return FALSE;
+            return false;

     }
     while ( !file.Eof() );
 
     }
     while ( !file.Eof() );
 

-    return TRUE;
+    return true;

 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )
 }
 
 bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
     do
 
     char buf[4096];
     do


@@ -2239,12 +2376,12 @@ bool wxTransferStreamToFile(wxSTD istream& stream, const wxString& filename)
         if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
         {
             if ( !file.Write(buf, stream.gcount()) )
         if ( !stream.bad() ) // fail may be set on EOF, don't use operator!()
         {
             if ( !file.Write(buf, stream.gcount()) )

-                return FALSE;
+                return false;

         }
     }
     while ( !stream.eof() );
 
         }
     }
     while ( !stream.eof() );
 

-    return TRUE;
+    return true;

 }
 
 #else // !wxUSE_STD_IOSTREAM
 }
 
 #else // !wxUSE_STD_IOSTREAM


@@ -2253,7 +2390,7 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )
 {
     wxFFile file(filename, _T("rb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
 
 
     char buf[4096];
 


@@ -2262,22 +2399,22 @@ bool wxTransferFileToStream(const wxString& filename, wxOutputStream& stream)
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )
     {
         nRead = file.Read(buf, WXSIZEOF(buf));
         if ( file.Error() )

-            return FALSE;
+            return false;

 
         stream.Write(buf, nRead);
         if ( !stream )
 
         stream.Write(buf, nRead);
         if ( !stream )

-            return FALSE;
+            return false;

     }
     while ( !file.Eof() );
 
     }
     while ( !file.Eof() );
 

-    return TRUE;
+    return true;

 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )
 }
 
 bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 {
     wxFFile file(filename, _T("wb"));
     if ( !file.IsOpened() )

-        return FALSE;
+        return false;

 
     char buf[4096];
     do
 
     char buf[4096];
     do


@@ -2286,11 +2423,11 @@ bool wxTransferStreamToFile(wxInputStream& stream, const wxString& filename)
 
         const size_t nRead = stream.LastRead();
         if ( !nRead || !file.Write(buf, nRead) )
 
         const size_t nRead = stream.LastRead();
         if ( !nRead || !file.Write(buf, nRead) )

-            return FALSE;
+            return false;

     }
     while ( !stream.Eof() );
 
     }
     while ( !stream.Eof() );
 

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
 }
 
 #endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM