Added (untested) support for sub-locales.

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

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 4f7427ebfec657c541cc160f48099bc22dcec95e..ae846c0c8fdac6793336c59e6a17bce2a063c2f2 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -194,18 +194,21 @@ bool wxDocument::Save(void)
        
 bool wxDocument::SaveAs(void)
 {
-  wxDocTemplate *docTemplate = GetDocumentTemplate();
-  if (!docTemplate)
-    return FALSE;
-  
-  char *tmp = wxFileSelector(_("Save as"), docTemplate->GetDirectory(), GetFilename(),
-    docTemplate->GetDefaultExtension(), docTemplate->GetFileFilter(),
-    wxSAVE|wxOVERWRITE_PROMPT, GetDocumentWindow());
+    wxDocTemplate *docTemplate = GetDocumentTemplate();
+    if (!docTemplate)
+        return FALSE;
     
-  if (!tmp)
-    return FALSE;
-  else
-  {
+    wxString tmp = wxFileSelector(_("Save as"),
+                                  docTemplate->GetDirectory(),
+                                  GetFilename(),
+                                  docTemplate->GetDefaultExtension(),
+                                  docTemplate->GetFileFilter(),
+                                  wxSAVE | wxOVERWRITE_PROMPT,
+                                  GetDocumentWindow());
+    
+    if (tmp.IsEmpty())
+        return FALSE;
+
     wxString fileName(tmp);
     wxString path("");
     wxString name("");
@@ -231,8 +234,8 @@ bool wxDocument::SaveAs(void)
       view->OnChangeFilename();
       node = node->Next();
     }
-  }
-  return OnSaveDocument(m_documentFile);
+
+    return OnSaveDocument(m_documentFile);
 }
        
 bool wxDocument::OnSaveDocument(const wxString& file)
@@ -1044,6 +1047,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
     m_fileHistory->RemoveMenu(menu);
 }
 
+#if wxUSE_CONFIG
 void wxDocManager::FileHistoryLoad(wxConfigBase& config)
 {
   if (m_fileHistory)
@@ -1055,6 +1059,7 @@ void wxDocManager::FileHistorySave(wxConfigBase& config)
   if (m_fileHistory)
     m_fileHistory->Save(config);
 }
+#endif
 
 void wxDocManager::FileHistoryAddFilesToMenu(wxMenu* menu)
 {
@@ -1142,33 +1147,30 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **WXUNUSED(templat
 {
   // We can only have multiple filters in Windows
 #ifdef __WXMSW__
-  char *descrBuf = new char[1000];  // FIXME static buffer
-  descrBuf[0] = 0;
-  int i;
-  for (i = 0; i < noTemplates; i++)
-  {
-    if (templates[i]->IsVisible())
+    wxString descrBuf;
+
+    int i;
+    for (i = 0; i < noTemplates; i++)
     {
-      strcat(descrBuf, templates[i]->GetDescription());
-      strcat(descrBuf, " (");
-      strcat(descrBuf, templates[i]->GetFileFilter());
-      strcat(descrBuf, ") ");
-      strcat(descrBuf, "|");
-      strcat(descrBuf, templates[i]->GetFileFilter());
-      strcat(descrBuf, "|");
+        if (templates[i]->IsVisible())
+        {
+            // add a '|' to separate this filter from the previous one
+            if ( !descrBuf.IsEmpty() )
+                descrBuf << '|';
+
+            descrBuf << templates[i]->GetDescription()
+                     << " (" << templates[i]->GetFileFilter() << ") |"
+                     << templates[i]->GetFileFilter();
+        }
     }
-  }
-  int len = strlen(descrBuf);
-  if (len > 0)
-    // Omit final "|"
-    descrBuf[len-1] = 0;
 #else
-  char* descrBuf = copystring("*.*");
+  wxString descrBuf = "*.*";
 #endif
 
-  char *pathTmp = wxFileSelector(_("Select a file"), "", "", "", descrBuf, 0, wxTheApp->GetTopWindow());
-  delete[] descrBuf;
-  if (pathTmp)
+  wxString pathTmp = wxFileSelector(_("Select a file"), "", "", "",
+                                    descrBuf, 0, wxTheApp->GetTopWindow());
+
+  if (!pathTmp.IsEmpty())
   {
     path = pathTmp;
     char *theExt = FindExtension((char *)(const char *)path);
@@ -1256,7 +1258,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
   int n = 0;
   for (i = 0; i < noTemplates; i++)
   {
-    if (templates[i]->IsVisible() && templates[i]->GetViewName())
+    if (templates[i]->IsVisible() && (templates[i]->GetViewName() != ""))
     {
       strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
       data[n] = (char *)templates[i];
@@ -1704,7 +1706,7 @@ void wxCommandProcessor::SetMenuStrings(void)
         // 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) redoCommandName = _("Unnamed command");
+        if (redoCommandName == "") redoCommandName = _("Unnamed command");
         buf = wxString(_("&Redo ")) + redoCommandName;
         m_commandEditMenu->SetLabel(wxID_REDO, buf);
         m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1820,6 +1822,7 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
   m_fileMenus.DeleteObject(menu);
 }
 
+#if wxUSE_CONFIG
 void wxFileHistory::Load(wxConfigBase& config)
 {
   m_fileHistoryN = 0;
@@ -1846,6 +1849,7 @@ void wxFileHistory::Save(wxConfigBase& config)
     config.Write(buf, wxString(m_fileHistory[i]));
   }
 }
+#endif
 
 void wxFileHistory::AddFilesToMenu()
 {