Disable typemap for wxImage constructors

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index f6f41c4e1146c26e290688e32078149fdb69d984..221ce1b1364ab66a3209fe731c1727f3cf1e0d9a 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -183,23 +183,43 @@ 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;
-          ++it )
+    // 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())
+        wxView *view = (wxView *)*i;
+        if ( !view->Close() )

             return false;
             return false;

+    }

 
 

-        delete view; // Deletes node implicitly
+    // 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();
+
+            bool isLastOne = m_documentViews.size() == 1;

 
 

-    // 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;
+            // 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;
+        }
+    }

 
     return true;
 }
 
     return true;
 }


@@ -269,7 +289,7 @@ bool wxDocument::SaveAs()
                 t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
             {
                 // add a '|' to separate this filter from the previous one
                 t->GetDocClassInfo() == docTemplate->GetDocClassInfo())
             {
                 // add a '|' to separate this filter from the previous one

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

                     filter << wxT('|');
 
                 filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")
                     filter << wxT('|');
 
                 filter << t->GetDescription() << wxT(" (") << t->GetFileFilter() << wxT(") |")


@@ -290,14 +310,14 @@ bool wxDocument::SaveAs()
             wxSAVE | wxOVERWRITE_PROMPT,
             GetDocumentWindow());
 
             wxSAVE | wxOVERWRITE_PROMPT,
             GetDocumentWindow());
 

-    if (tmp.IsEmpty())
+    if (tmp.empty())

         return false;
 
     wxString fileName(tmp);
     wxString path, name, ext;
     wxSplitPath(fileName, & path, & name, & ext);
 
         return false;
 
     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();


@@ -395,12 +415,12 @@ bool wxDocument::Revert()
 // 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;
         return true;
     }
     {
         buf = m_documentTitle;
         return true;
     }

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

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


@@ -435,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"));


@@ -545,7 +565,7 @@ void wxDocument::SetFilename(const wxString& filename, bool notifyViews)
 bool wxDocument::DoSaveDocument(const wxString& file)
 {
     wxString msgTitle;
 bool wxDocument::DoSaveDocument(const wxString& file)
 {
     wxString msgTitle;

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

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


@@ -577,7 +597,7 @@ bool wxDocument::DoSaveDocument(const wxString& file)
 bool wxDocument::DoOpenDocument(const wxString& file)
 {
     wxString msgTitle;
 bool wxDocument::DoOpenDocument(const wxString& file)
 {
     wxString msgTitle;

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

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


@@ -950,12 +970,12 @@ void wxDocManager::OnFileCloseAll(wxCommandEvent& WXUNUSED(event))
 
 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();
     }


@@ -1205,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;
         }


@@ -1228,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;
         }


@@ -1239,9 +1269,7 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     // Existing document
     wxDocTemplate *temp;
 
     // Existing document
     wxDocTemplate *temp;
 

-    wxString path2(wxT(""));
-    if (path != wxT(""))
-        path2 = path;
+    wxString path2 = path;

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


@@ -1270,6 +1298,28 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
             }
         }
 
             }
         }
 

+        //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)
         {


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


@@ -1541,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"));


@@ -1561,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);


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

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

     }
 
     return theTemplate;
     }
 
     return theTemplate;


@@ -1898,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) )


@@ -2230,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();
 }