some conflicts resolved

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ef12c9a899b1a3145e3a059f4e3b0fbcb67ee8aa..95b489ee7d3c1744b8e2944555d023ff3d051836 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -103,7 +103,7 @@ static inline wxString FindExtension(const wxChar *path);
 // local constants
 // ----------------------------------------------------------------------------
 
-static const char *s_MRUEntryFormat = T("&%d %s");
+static const char *s_MRUEntryFormat = wxT("&%d %s");
 
 // ============================================================================
 // implementation
@@ -224,7 +224,7 @@ bool wxDocument::Save()
     bool ret = FALSE;
 
     if (!IsModified()) return TRUE;
-    if (m_documentFile == T("") || !m_savedYet)
+    if (m_documentFile == wxT("") || !m_savedYet)
         ret = SaveAs();
     else
         ret = OnSaveDocument(m_documentFile);
@@ -254,7 +254,7 @@ bool wxDocument::SaveAs()
     wxString path, name, ext;
     wxSplitPath(fileName, & path, & name, & ext);
 
-    if (ext.IsEmpty() || ext == T(""))
+    if (ext.IsEmpty() || ext == wxT(""))
     {
         fileName += ".";
         fileName += docTemplate->GetDefaultExtension();
@@ -283,7 +283,7 @@ bool wxDocument::OnSaveDocument(const wxString& file)
         return FALSE;
 
     wxString msgTitle;
-    if (wxTheApp->GetAppName() != T(""))
+    if (wxTheApp->GetAppName() != wxT(""))
         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));
@@ -319,7 +319,7 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         return FALSE;
 
     wxString msgTitle;
-    if (wxTheApp->GetAppName() != T(""))
+    if (wxTheApp->GetAppName() != wxT(""))
         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxString(_("File error"));
@@ -378,12 +378,12 @@ bool wxDocument::Revert()
 // Get title, or filename if no title, else unnamed
 bool wxDocument::GetPrintableName(wxString& buf) const
 {
-    if (m_documentTitle != T(""))
+    if (m_documentTitle != wxT(""))
     {
         buf = m_documentTitle;
         return TRUE;
     }
-    else if (m_documentFile != T(""))
+    else if (m_documentFile != wxT(""))
     {
         buf = wxFileNameFromPath(m_documentFile);
         return TRUE;
@@ -418,7 +418,7 @@ bool wxDocument::OnSaveModified()
         GetPrintableName(title);
 
         wxString msgTitle;
-        if (wxTheApp->GetAppName() != T(""))
+        if (wxTheApp->GetAppName() != wxT(""))
             msgTitle = wxTheApp->GetAppName();
         else
             msgTitle = wxString(_("Warning"));
@@ -706,6 +706,7 @@ wxDocManager::wxDocManager(long flags, bool initialize)
     m_currentView = (wxView *) NULL;
     m_maxDocsOpen = 10000;
     m_fileHistory = (wxFileHistory *) NULL;
+    m_lastDirectory = wxT("") ;
     if (initialize)
         Initialize();
 }
@@ -985,8 +986,8 @@ wxDocument *wxDocManager::CreateDocument(const wxString& path, long flags)
     // Existing document
     wxDocTemplate *temp = (wxDocTemplate *) NULL;
 
-    wxString path2(T(""));
-    if (path != T(""))
+    wxString path2(wxT(""));
+    if (path != wxT(""))
         path2 = path;
 
     if (flags & wxDOC_SILENT)
@@ -1211,21 +1212,21 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
         {
             // add a '|' to separate this filter from the previous one
             if ( !descrBuf.IsEmpty() )
-                descrBuf << T('|');
+                descrBuf << wxT('|');
 
             descrBuf << templates[i]->GetDescription()
-                << T(" (") << templates[i]->GetFileFilter() << T(") |")
+                << wxT(" (") << templates[i]->GetFileFilter() << wxT(") |")
                 << templates[i]->GetFileFilter();
         }
     }
 #else
-    wxString descrBuf = T("*.*");
+    wxString descrBuf = wxT("*.*");
 #endif
 
     int FilterIndex = 0;
     wxString pathTmp = wxFileSelectorEx(_("Select a file"),
-                                        T(""),
-                                        T(""),
+                                        m_lastDirectory,
+                                        wxT(""),
                                         &FilterIndex,
                                         descrBuf,
                                         0,
@@ -1233,6 +1234,8 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 
     if (!pathTmp.IsEmpty())
     {
+        m_lastDirectory = wxPathOnly(pathTmp);
+
         path = pathTmp;
         wxString theExt = FindExtension(path);
         if (!theExt)
@@ -1250,7 +1253,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     }
     else
     {
-        path = T("");
+        path = wxT("");
         return (wxDocTemplate *) NULL;
     }
 #if 0
@@ -1261,7 +1264,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
     if (!temp)
         return (wxDocTemplate *) NULL;
 
-    wxChar *pathTmp = wxFileSelector(_("Select a file"), T(""), T(""),
+    wxChar *pathTmp = wxFileSelector(_("Select a file"), wxT(""), wxT(""),
             temp->GetDefaultExtension(),
             temp->GetFileFilter(),
             0, wxTheApp->GetTopWindow());
@@ -1279,7 +1282,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
                                                 int noTemplates)
 {
-    const wxChar **strings = new wxChar *[noTemplates];
+    wxChar **strings = new wxChar *[noTemplates];
     wxChar **data = new wxChar *[noTemplates];
     int i;
     int n = 0;
@@ -1287,7 +1290,7 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
     {
         if (templates[i]->IsVisible())
         {
-            strings[n] = templates[i]->m_description;
+            strings[n] = (wxChar *)templates[i]->m_description.c_str();
             data[n] = (wxChar *)templates[i];
             n ++;
         }
@@ -1316,15 +1319,15 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
 wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         int noTemplates)
 {
-    const wxChar **strings = new wxChar *[noTemplates];
+    wxChar **strings = new wxChar *[noTemplates];
     wxChar **data = new wxChar *[noTemplates];
     int i;
     int n = 0;
     for (i = 0; i < noTemplates; i++)
     {
-        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != T("")))
+        if (templates[i]->IsVisible() && (templates[i]->GetViewName() != wxT("")))
         {
-            strings[n] = templates[i]->m_viewTypeName;
+            strings[n] = (wxChar *)templates[i]->m_viewTypeName.c_str();
             data[n] = (wxChar *)templates[i];
             n ++;
         }
@@ -1759,7 +1762,7 @@ void wxCommandProcessor::SetMenuStrings()
         {
             wxCommand *command = (wxCommand *)m_currentCommand->Data();
             wxString commandName(command->GetName());
-            if (commandName == T("")) commandName = _("Unnamed command");
+            if (commandName == wxT("")) commandName = _("Unnamed command");
             bool canUndo = command->CanUndo();
             if (canUndo)
                 buf = wxString(_("&Undo ")) + commandName;
@@ -1774,7 +1777,7 @@ void wxCommandProcessor::SetMenuStrings()
             {
                 wxCommand *redoCommand = (wxCommand *)m_currentCommand->Next()->Data();
                 wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == T("")) redoCommandName = _("Unnamed command");
+                if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1801,7 +1804,7 @@ void wxCommandProcessor::SetMenuStrings()
                 // we've undone to the start of the list, but can redo the first.
                 wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
                 wxString redoCommandName(redoCommand->GetName());
-                if (redoCommandName == T("")) redoCommandName = _("Unnamed command");
+                if (redoCommandName == wxT("")) redoCommandName = _("Unnamed command");
                 buf = wxString(_("&Redo ")) + redoCommandName;
                 m_commandEditMenu->SetLabel(wxID_REDO, buf);
                 m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1900,7 +1903,7 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
 void wxFileHistory::RemoveFileFromHistory(int i)
 {
     wxCHECK_RET( i < m_fileHistoryN,
-                 T("invalid index in wxFileHistory::RemoveFileFromHistory") );
+                 wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 
     wxNode* node = m_fileMenus.First();
     while ( node )
@@ -1932,7 +1935,7 @@ void wxFileHistory::RemoveFileFromHistory(int i)
 
         // to be removed as soon as wxMenu::Delete() is implemented
 #if 1
-        menu->SetLabel(wxID_FILE1 + m_fileHistoryN - 1, T(""));
+        menu->SetLabel(wxID_FILE1 + m_fileHistoryN - 1, wxT(""));
 #endif
 
         node = node->Next();
@@ -1964,13 +1967,13 @@ void wxFileHistory::Load(wxConfigBase& config)
 {
     m_fileHistoryN = 0;
     wxString buf;
-    buf.Printf(T("file%d"), m_fileHistoryN+1);
+    buf.Printf(wxT("file%d"), m_fileHistoryN+1);
     wxString historyFile;
-    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != T("")))
+    while ((m_fileHistoryN <= m_fileMaxFiles) && config.Read(buf, &historyFile) && (historyFile != wxT("")))
     {
         m_fileHistory[m_fileHistoryN] = copystring((const wxChar*) historyFile);
         m_fileHistoryN ++;
-        buf.Printf(T("file%d"), m_fileHistoryN+1);
+        buf.Printf(wxT("file%d"), m_fileHistoryN+1);
         historyFile = "";
     }
     AddFilesToMenu();
@@ -1982,7 +1985,7 @@ void wxFileHistory::Save(wxConfigBase& config)
     for (i = 0; i < m_fileHistoryN; i++)
     {
         wxString buf;
-        buf.Printf(T("file%d"), i+1);
+        buf.Printf(wxT("file%d"), i+1);
         config.Write(buf, wxString(m_fileHistory[i]));
     }
 }