X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52b9ca21ac6c53d841028542771c839590a63db1..3bdc265d9d49ac78cb5000fbf3d694ed93d0e665:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 02fdca8fe4..549eb66f48 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -248,7 +248,7 @@ bool wxDocument::SaveAs()
 
     wxString tmp = wxFileSelector(_("Save as"),
             docTemplate->GetDirectory(),
-            GetFilename(),
+            wxFileNameFromPath(GetFilename()),
             docTemplate->GetDefaultExtension(),
             docTemplate->GetFileFilter(),
             wxSAVE | wxOVERWRITE_PROMPT,
@@ -1441,15 +1441,34 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
-    for (i = 0; i < noTemplates; i++)
-    {
-        if (templates[i]->IsVisible())
-        {
-            strings.Add(templates[i]->m_description);
-            data[n] = templates[i];
-            n ++;
-        }
-    }
+	for (i = 0; i < noTemplates; i++)
+	{
+		if (templates[i]->IsVisible())
+		{
+			strings.Add(templates[i]->m_description);
+			if (!sort)
+			{
+				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];
+			}
+		}
+	}
 
     wxDocTemplate *theTemplate;
 
@@ -1495,11 +1514,30 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
             strings.Add(templ->m_viewTypeName);
-            data[n] = templ;
-            n ++;
+			if (!sort)
+			{
+				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];
+			}
+		}
+	}
+
     wxDocTemplate *theTemplate;
 
     // the same logic as above
@@ -2124,11 +2162,6 @@ void wxFileHistory::RemoveFileFromHistory(int i)
     wxCHECK_RET( i < m_fileHistoryN,
                  wxT("invalid index in wxFileHistory::RemoveFileFromHistory") );
 
-    wxNode* node = m_fileMenus.First();
-    while ( node )
-    {
-        wxMenu* menu = (wxMenu*) node->Data();
-
         // delete the element from the array (could use memmove() too...)
         delete [] m_fileHistory[i];
 
@@ -2138,6 +2171,12 @@ void wxFileHistory::RemoveFileFromHistory(int i)
             m_fileHistory[j] = m_fileHistory[j + 1];
         }
 
+    wxNode* node = m_fileMenus.First();
+    while ( node )
+    {
+        wxMenu* menu = (wxMenu*) node->Data();
+
+
         // shuffle filenames up
         wxString buf;
         for ( j = i; j < m_fileHistoryN - 1; j++ )
@@ -2149,6 +2188,7 @@ void wxFileHistory::RemoveFileFromHistory(int i)
         node = node->Next();
 
         // delete the last menu item which is unused now
+        if (menu->FindItem(wxID_FILE1 + m_fileHistoryN - 1))
         menu->Delete(wxID_FILE1 + m_fileHistoryN - 1);
 
         // delete the last separator too if no more files are left