X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33a201363a194a38ee0f4e6b2c42b34b00d69731..baaae89f09ece7ab8a17570ee535683b9d14aeda:/src/common/docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 0015cce6e0..c368a8ee52 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -341,7 +341,8 @@ bool wxDocument::OnOpenDocument(const wxString& file)
         return FALSE;
     }
 #if wxUSE_STD_IOSTREAM
-    if (!LoadObject(store))
+    LoadObject(store);
+    if ( !store && !store.eof() )
 #else
     int res = LoadObject(store).LastError();
     if ((res != wxSTREAM_NOERROR) &&
@@ -593,7 +594,7 @@ bool wxView::Close(bool deleteWindow)
 
 void wxView::Activate(bool activate)
 {
-    if (GetDocumentManager())
+    if (GetDocument() && GetDocumentManager())
     {
         OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
         GetDocumentManager()->ActivateView(this, activate);
@@ -960,7 +961,7 @@ void wxDocManager::OnUpdateFileNew(wxUpdateUIEvent& event)
 void wxDocManager::OnUpdateFileSave(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
-    event.Enable( (doc != (wxDocument*) NULL) );
+    event.Enable( doc && doc->IsModified() );
 }
 
 void wxDocManager::OnUpdateFileSaveAs(wxUpdateUIEvent& event)
@@ -973,12 +974,16 @@ void wxDocManager::OnUpdateUndo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanUndo()) );
+    if (doc && doc->GetCommandProcessor())
+        doc->GetCommandProcessor()->SetMenuStrings();
 }
 
 void wxDocManager::OnUpdateRedo(wxUpdateUIEvent& event)
 {
     wxDocument *doc = GetCurrentDocument();
     event.Enable( (doc && doc->GetCommandProcessor() && doc->GetCommandProcessor()->CanRedo()) );
+    if (doc && doc->GetCommandProcessor())
+        doc->GetCommandProcessor()->SetMenuStrings();
 }
 
 void wxDocManager::OnUpdatePrint(wxUpdateUIEvent& event)
@@ -1191,8 +1196,9 @@ bool wxDocManager::FlushDoc(wxDocument *WXUNUSED(doc))
 
 wxDocument *wxDocManager::GetCurrentDocument() const
 {
-    if (m_currentView)
-        return m_currentView->GetDocument();
+    wxView *view = GetCurrentView();
+    if (view)
+        return view->GetDocument();
     else
         return (wxDocument *) NULL;
 }
@@ -1456,13 +1462,26 @@ 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);
-			if (!sort)
+    		int j;
+            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
+                   )
+                    want = FALSE;
+			}
+
+            if ( want )
 			{
+    			strings.Add(templates[i]->m_description);
+
 				data[n] = templates[i];
 				n ++;
 			}
@@ -1523,14 +1542,24 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
     wxDocTemplate **data = new wxDocTemplate *[noTemplates];
     int i;
     int n = 0;
+        
     for (i = 0; i < noTemplates; i++)
     {
         wxDocTemplate *templ = templates[i];
         if ( templ->IsVisible() && !templ->GetViewName().empty() )
         {
-            strings.Add(templ->m_viewTypeName);
-			if (!sort)
+    		int j;
+            bool want = TRUE;
+			for (j = 0; j < n; j++)
 			{
+                //filter out NOT unique views
+				if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
+                    want = FALSE;
+			}
+
+            if ( want )
+            {
+    			strings.Add(templ->m_viewTypeName);
 				data[n] = templ;
 				n ++;
 			}