[commit] r1266 - trunk/GME/GMEActiveBrowser

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Tue Apr 12 15:38:14 CDT 2011


Author: ksmyth
Date: Tue Apr 12 15:38:13 2011
New Revision: 1266

Log:
Fix GME-239 : Support copy-paste in Tree Browser

Modified:
   trunk/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp

Modified: trunk/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp
==============================================================================
--- trunk/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp	Tue Apr 12 15:05:13 2011	(r1265)
+++ trunk/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp	Tue Apr 12 15:38:13 2011	(r1266)
@@ -846,9 +846,10 @@
 		CMgaObjectProxy ObjectProxy;
 		if(m_TreeAggregate.m_MgaMap.LookupObjectProxy(hItem, ObjectProxy))
 		{
-			if ( ObjectProxy.m_TypeInfo == OBJTYPE_MODEL     ||	// FCOs except connection
+			if ( ObjectProxy.m_TypeInfo == OBJTYPE_MODEL     ||	// FCOs
 			     ObjectProxy.m_TypeInfo == OBJTYPE_ATOM      ||
 			     ObjectProxy.m_TypeInfo == OBJTYPE_REFERENCE ||
+			     ObjectProxy.m_TypeInfo == OBJTYPE_CONNECTION ||
 			     ObjectProxy.m_TypeInfo == OBJTYPE_SET)
 			{
 				CComQIPtr<IMgaFCO> ccpMgaFCO( ObjectProxy.m_pMgaObject);
@@ -899,14 +900,7 @@
 		
 		pGMEDataSource->CacheDescriptor(&GMEDataDescriptor);
 
-
 		pGMEDataSource->SetClipboard();
-
-		
-	}
-	else
-	{
-		MessageBox(_T("Connections cannot be  copied."),_T("Copy Error"), MB_ICONERROR);
 	}
 
 	CGMEDataDescriptor::destructList( rectSelectedList);
@@ -1367,7 +1361,7 @@
 	}
 	else
 	{
-		MessageBox(_T("Connections cannot be dropped or copied."),_T("Error"), MB_ICONERROR);
+		MessageBox(_T("Connections cannot be drag-and-dropped."), _T("Error"), MB_ICONERROR);
 	}
 
 	CGMEDataDescriptor::destructList( rectSelectedList);


More information about the gme-commit mailing list