Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index e43e8f25d659c91f3e4600126bee02e5af9955c5..221ce1b1364ab66a3209fe731c1727f3cf1e0d9a 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)


@@ -133,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()


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

-        return FALSE;
+        return false;

 }
 
 bool wxDocument::OnCloseDocument()
 }
 
 bool wxDocument::OnCloseDocument()


@@ -174,8 +174,8 @@ bool wxDocument::OnCloseDocument()
     // Tell all views that we're about to close
     NotifyClosing();
     DeleteContents();
     // Tell all views that we're about to close
     NotifyClosing();
     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


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

-    wxList::iterator it, en;

 
 

-    for ( it = m_documentViews.begin(), en = m_documentViews.end();
-          it != en;
-          )
+    // first check if all views agree to be closed
+    const wxList::iterator end = m_documentViews.end();
+    for ( wxList::iterator i = m_documentViews.begin(); i != end; ++i )

     {
     {

-        wxView *view = (wxView *)*it;
-        if (!view->Close())
-            return FALSE;
+        wxView *view = (wxView *)*i;
+        if ( !view->Close() )
+            return false;
+    }
+
+    // all views agreed to close, now do close them
+    if ( m_documentViews.empty() )
+    {
+        // normally the document would be implicitly deleted when the last view
+        // is, but if don't have any views, do it here instead
+        if ( manager && manager->GetDocuments().Member(this) )
+            delete this;
+    }
+    else // have views
+    {
+        // as we delete elements we iterate over, don't use the usual "from
+        // begin to end" loop
+        for ( ;; )
+        {
+            wxView *view = (wxView *)*m_documentViews.begin();

 
 

-        wxList::iterator next = it; ++next;
+            bool isLastOne = m_documentViews.size() == 1;

 
 

-        delete view; // Deletes node implicitly
-        it = next;
+            // this always deletes the node implicitly and if this is the last
+            // view also deletes this object itself (also implicitly, great),
+            // so we can't test for m_documentViews.empty() after calling this!
+            delete view;
+
+            if ( isLastOne )
+                break;
+        }

     }
     }

-    // 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


@@ -221,25 +239,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();


@@ -251,24 +269,55 @@ 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.empty() )
+                    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());
 
             wxSAVE | wxOVERWRITE_PROMPT,
             GetDocumentWindow());
 

-    if (tmp.IsEmpty())
-        return FALSE;
+    if (tmp.empty())
+        return false;

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

-    if (ext.IsEmpty() || ext == wxT(""))
+    if (ext.empty())

     {
         fileName += wxT(".");
         fileName += docTemplate->GetDefaultExtension();
     {
         fileName += wxT(".");
         fileName += docTemplate->GetDefaultExtension();


@@ -288,7 +337,7 @@ bool wxDocument::SaveAs()
 
     // Files that were not saved correctly are not added to the FileHistory.
     if (!OnSaveDocument(m_documentFile))
 
     // Files that were not saved correctly are not added to the FileHistory.
     if (!OnSaveDocument(m_documentFile))

-        return FALSE;
+        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.
 
    // 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.


@@ -301,93 +350,42 @@ bool wxDocument::SaveAs()
        // The user will probably not be able to open the file again, so
        // we could warn about the wrong file-extension here.
    }
        // The user will probably not be able to open the file again, so
        // we could warn about the wrong file-extension here.
    }

-   return TRUE;
+   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


@@ -410,27 +408,27 @@ wxOutputStream& wxDocument::SaveObject(wxOutputStream& stream)
 
 bool wxDocument::Revert()
 {
 
 bool wxDocument::Revert()
 {

-    return FALSE;
+    return false;

 }
 
 
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
 }
 
 
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {

-    if (m_documentTitle != wxT(""))
+    if (!m_documentTitle.empty())

     {
         buf = m_documentTitle;
     {
         buf = m_documentTitle;

-        return TRUE;
+        return true;

     }
     }

-    else if (m_documentFile != wxT(""))
+    else if (!m_documentFile.empty())

     {
         buf = wxFileNameFromPath(m_documentFile);
     {
         buf = wxFileNameFromPath(m_documentFile);

-        return TRUE;
+        return true;

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

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -448,7 +446,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())


@@ -457,7 +455,7 @@ bool wxDocument::OnSaveModified()
         GetPrintableName(title);
 
         wxString msgTitle;
         GetPrintableName(title);
 
         wxString msgTitle;

-        if (wxTheApp->GetAppName() != wxT(""))
+        if (!wxTheApp->GetAppName().empty())

             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));


@@ -470,20 +468,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)


@@ -493,22 +491,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.


@@ -564,6 +562,76 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
     }
 }
 
     }
 }
 

+bool wxDocument::DoSaveDocument(const wxString& file)
+{
+    wxString msgTitle;
+    if (!wxTheApp->GetAppName().empty())
+        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().empty())
+        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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Document view
 // ----------------------------------------------------------------------------


@@ -577,7 +645,7 @@ wxView::wxView()
 
 wxView::~wxView()
 {
 
 wxView::~wxView()
 {

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

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


@@ -587,7 +655,7 @@ bool wxView::ProcessEvent(wxEvent& event)
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);
 
     if ( !GetDocument() || !GetDocument()->ProcessEvent(event) )
         return wxEvtHandler::ProcessEvent(event);
 

-    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))


@@ -625,9 +693,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)


@@ -641,7 +709,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


@@ -688,29 +756,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;
         return (wxDocument *) NULL;

-    wxDocument *doc = (wxDocument *)m_docClassInfo->CreateObject();
+
+    if (InitDocument(doc, path, flags))
+    {
+        return doc;
+    }
+    else
+    {
+        return (wxDocument *) NULL;
+    }
+}
+
+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))
     {


@@ -730,6 +812,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
 // ----------------------------------------------------------------------------


@@ -757,11 +855,9 @@ BEGIN_EVENT_TABLE(wxDocManager, wxEvtHandler)
 
 #if wxUSE_PRINTING_ARCHITECTURE
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
 
 #if wxUSE_PRINTING_ARCHITECTURE
     EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)

-    EVT_MENU(wxID_PRINT_SETUP, wxDocManager::OnPrintSetup)

     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
 
     EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
     EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
 
     EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)

-    EVT_UPDATE_UI(wxID_PRINT_SETUP, wxDocManager::OnUpdatePrintSetup)

     EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
 #endif
 END_EVENT_TABLE()
     EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
 #endif
 END_EVENT_TABLE()


@@ -801,9 +897,9 @@ bool wxDocManager::CloseDocument(wxDocument* doc, bool force)
         if (m_docs.Member(doc))
             delete doc;
 
         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)


@@ -813,22 +909,24 @@ bool wxDocManager::CloseDocuments(bool force)
     {
         wxDocument *doc = (wxDocument *)node->GetData();
         wxList::compatibility_iterator next = node->GetNext();
     {
         wxDocument *doc = (wxDocument *)node->GetData();
         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;
+
+    m_currentView = NULL;

 
     wxList::compatibility_iterator node = m_templates.GetFirst();
     while (node)
 
     wxList::compatibility_iterator node = m_templates.GetFirst();
     while (node)


@@ -838,13 +936,13 @@ bool wxDocManager::Clear(bool force)
         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()


@@ -867,17 +965,17 @@ 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))
 {

-    CreateDocument( wxT(""), wxDOC_NEW );
+    CreateDocument( wxEmptyString, wxDOC_NEW );

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

-    if ( !CreateDocument( wxT(""), 0) )
+    if ( !CreateDocument( wxEmptyString, 0) )

     {
         OnOpenFileFailure();
     }
     {
         OnOpenFileFailure();
     }


@@ -918,29 +1016,13 @@ 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;
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 
         delete printout;
     }
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 

-void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
-{
-#if wxUSE_PRINTING_ARCHITECTURE
-    wxWindow *parentWin = wxTheApp->GetTopWindow();
-    wxView *view = GetCurrentView();
-    if (view)
-        parentWin = view->GetFrame();
-
-    wxPrintDialogData data;
-
-    wxPrintDialog printerDialog(parentWin, &data);
-    printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
-    printerDialog.ShowModal();
-#endif // wxUSE_PRINTING_ARCHITECTURE
-}
-

 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE
 void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -952,14 +1034,19 @@ 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
 }


@@ -990,7 +1077,7 @@ void wxDocManager::OnRedo(wxCommandEvent& event)
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {
 
 void wxDocManager::OnUpdateFileOpen(wxUpdateUIEvent& event)
 {

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

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


@@ -1007,7 +1094,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)


@@ -1026,7 +1113,7 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)

-        event.Enable(FALSE);
+        event.Enable(false);

     else if (!doc->GetCommandProcessor())
         event.Skip();
     else
     else if (!doc->GetCommandProcessor())
         event.Skip();
     else


@@ -1040,7 +1127,7 @@ void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)
 {
     wxDocument *doc = GetCurrentDocument();
     if (!doc)

-        event.Enable(FALSE);
+        event.Enable(false);

     else if (!doc->GetCommandProcessor())
         event.Skip();
     else
     else if (!doc->GetCommandProcessor())
         event.Skip();
     else


@@ -1056,11 +1143,6 @@ void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
     event.Enable( (doc != (wxDocument*) NULL) );
 }
 
     event.Enable( (doc != (wxDocument*) NULL) );
 }
 

-void wxDocManager::OnUpdatePrintSetup(wxUpdateUIEvent& event)
-{
-    event.Enable( TRUE );
-}
-

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


@@ -1086,7 +1168,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);
 }


@@ -1128,7 +1210,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         {
             if (docToClose)
             {
         {
             if (docToClose)
             {

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

                 {
                     delete[] templates;
                     return NULL;
                 {
                     delete[] templates;
                     return NULL;


@@ -1143,7 +1225,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);

-                newDoc->OnNewDocument();
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }

             }
             return newDoc;
         }
             }
             return newDoc;
         }


@@ -1154,7 +1241,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
         {
             if (docToClose)
             {
         {
             if (docToClose)
             {

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

                 {
                     return NULL;
                 }
                 {
                     return NULL;
                 }


@@ -1166,7 +1253,12 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);
             {
                 newDoc->SetDocumentName(temp->GetDocumentName());
                 newDoc->SetDocumentTemplate(temp);

-                newDoc->OnNewDocument();
+                if (!newDoc->OnNewDocument() )
+                {
+                     // Document is implicitly deleted by DeleteAllViews
+                     newDoc->DeleteAllViews();
+                     return NULL;
+                }

             }
             return newDoc;
         }
             }
             return newDoc;
         }


@@ -1175,11 +1267,9 @@ 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;
+    wxString path2 = path;

 
     if (flags & wxDOC_SILENT)
     {
 
     if (flags & wxDOC_SILENT)
     {


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

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

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

+        //see if this file is already open
+        for (size_t i = 0; i < GetDocuments().GetCount(); ++i)
+        {
+            wxDocument* currentDoc = (wxDocument*)(GetDocuments().Item(i)->GetData());
+#ifdef __WXMSW__
+            //file paths are case-insensitive on Windows
+            if (path2.CmpNoCase(currentDoc->GetFilename()) == 0)
+#else
+            if (path2.Cmp(currentDoc->GetFilename()) == 0)
+#endif
+            {
+                //file already open. Just activate it and return
+                if (currentDoc->GetFirstView())
+                {
+                    ActivateView(currentDoc->GetFirstView(), true);
+                    if (currentDoc->GetDocumentWindow())
+                        currentDoc->GetDocumentWindow()->SetFocus();
+                    return currentDoc;
+                }
+            }
+        }
+

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


@@ -1284,7 +1396,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


@@ -1302,7 +1414,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)


@@ -1461,7 +1573,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         if (templates[i]->IsVisible())
         {
             // add a '|' to separate this filter from the previous one
         if (templates[i]->IsVisible())
         {
             // add a '|' to separate this filter from the previous one

-            if ( !descrBuf.IsEmpty() )
+            if ( !descrBuf.empty() )

                 descrBuf << wxT('|');
 
             descrBuf << templates[i]->GetDescription()
                 descrBuf << wxT('|');
 
             descrBuf << templates[i]->GetDescription()


@@ -1479,19 +1591,19 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,
 
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
                                         m_lastDirectory,

-                                        wxT(""),
+                                        wxEmptyString,

                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;
                                         &FilterIndex,
                                         descrBuf,
                                         0,
                                         parent);
 
     wxDocTemplate *theTemplate = (wxDocTemplate *)NULL;

-    if (!pathTmp.IsEmpty())
+    if (!pathTmp.empty())

     {
         if (!wxFileExists(pathTmp))
         {
             wxString msgTitle;
     {
         if (!wxFileExists(pathTmp))
         {
             wxString msgTitle;

-            if (!wxTheApp->GetAppName().IsEmpty())
+            if (!wxTheApp->GetAppName().empty())

                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));
                 msgTitle = wxTheApp->GetAppName();
             else
                 msgTitle = wxString(_("File error"));


@@ -1499,7 +1611,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 
             (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK | wxICON_EXCLAMATION,
                 parent);
 

-            path = wxT("");
+            path = wxEmptyString;

             return (wxDocTemplate *) NULL;
         }
         m_lastDirectory = wxPathOnly(pathTmp);
             return (wxDocTemplate *) NULL;
         }
         m_lastDirectory = wxPathOnly(pathTmp);


@@ -1523,7 +1635,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
     else
     {
     }
     else
     {

-        path = wxT("");
+        path = wxEmptyString;

     }
 
     return theTemplate;
     }
 
     return theTemplate;


@@ -1542,14 +1654,14 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
         if (templates[i]->IsVisible())
         {
             int j;
         if (templates[i]->IsVisible())
         {
             int j;

-            bool want = TRUE;
+            bool want = true;

             for (j = 0; j < n; j++)
             {
                 //filter out NOT unique documents + view combinations
                 if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
                      templates[i]->m_viewTypeName == data[j]->m_viewTypeName
                    )
             for (j = 0; j < n; j++)
             {
                 //filter out NOT unique documents + view combinations
                 if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
                      templates[i]->m_viewTypeName == data[j]->m_viewTypeName
                    )

-                    want = FALSE;
+                    want = false;

             }
 
             if ( want )
             }
 
             if ( want )


@@ -1564,7 +1676,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 
     if (sort)
     {
 
     if (sort)
     {

-        strings.Sort(wxStringSortAscending);
+        strings.Sort(); // ascending sort

         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;


@@ -1624,12 +1736,12 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
             int j;
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
             int j;

-            bool want = TRUE;
+            bool want = true;

             for (j = 0; j < n; j++)
             {
                 //filter out NOT unique views
                 if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
             for (j = 0; j < n; j++)
             {
                 //filter out NOT unique views
                 if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )

-                    want = FALSE;
+                    want = false;

             }
 
             if ( want )
             }
 
             if ( want )


@@ -1643,7 +1755,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
 
     if (sort)
     {
 
     if (sort)
     {

-        strings.Sort(wxStringSortAscending);
+        strings.Sort(); // ascending sort

         // Yes, this will be slow, but template lists
         // are typically short.
         int j;
         // Yes, this will be slow, but template lists
         // are typically short.
         int j;


@@ -1754,15 +1866,11 @@ wxDocChildFrame::wxDocChildFrame(wxDocument *doc,
         view->SetFrame(this);
 }
 
         view->SetFrame(this);
 }
 

-wxDocChildFrame::~wxDocChildFrame()
-{
-}
-

 // Extend event processing to search the view's event table
 bool wxDocChildFrame::ProcessEvent(wxEvent& event)
 {
     if (m_childView)
 // Extend event processing to search the view's event table
 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) )
     {


@@ -1770,10 +1878,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)


@@ -1788,15 +1896,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;


@@ -1842,7 +1948,7 @@ void wxDocParentFrame::OnMRUFile(wxCommandEvent& event)
 {
     int n = event.GetId() - wxID_FILE1;  // the index in MRU list
     wxString filename(m_docManager->GetHistoryFile(n));
 {
     int n = event.GetId() - wxID_FILE1;  // the index in MRU list
     wxString filename(m_docManager->GetHistoryFile(n));

-    if ( !filename.IsEmpty() )
+    if ( !filename.empty() )

     {
         // verify that the file exists before doing anything else
         if ( wxFile::Exists(filename) )
     {
         // verify that the file exists before doing anything else
         if ( wxFile::Exists(filename) )


@@ -1876,7 +1982,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


@@ -1906,8 +2012,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


@@ -1922,6 +2030,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.


@@ -1932,7 +2041,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)


@@ -1943,9 +2052,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)


@@ -2171,12 +2280,12 @@ void wxFileHistory::Load(wxConfigBase& config)
     wxString buf;
     buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
     wxString historyFile;
     wxString buf;
     buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
     wxString historyFile;

-    while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
+    while ((m_fileHistoryN < m_fileMaxFiles) && config.Read(buf, &historyFile) && (!historyFile.empty()))

     {
         m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
         m_fileHistoryN ++;
         buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);
     {
         m_fileHistory[m_fileHistoryN] = MYcopystring((const wxChar*) historyFile);
         m_fileHistoryN ++;
         buf.Printf(wxT("file%d"), (int)m_fileHistoryN+1);

-        historyFile = wxT("");
+        historyFile = wxEmptyString;

     }
     AddFilesToMenu();
 }
     }
     AddFilesToMenu();
 }


@@ -2257,7 +2366,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];
 


@@ -2266,22 +2375,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


@@ -2290,12 +2399,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


@@ -2304,7 +2413,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];
 


@@ -2313,22 +2422,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


@@ -2337,11 +2446,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