[GME-commit] GMESRC/GME/GMEActiveBrowser AggregateTreeCtrl.cpp,1.23,1.24

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/GMEActiveBrowser
In directory escher:/tmp/cvs-serv19932

Modified Files:
	AggregateTreeCtrl.cpp 
Log Message:
Drag and drop did not succeed When fco dragged from the View to a Folder in the ActiveBrowser.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: AggregateTreeCtrl.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** AggregateTreeCtrl.cpp	10 May 2005 18:09:12 -0000	1.23
--- AggregateTreeCtrl.cpp	12 May 2005 00:52:45 -0000	1.24
***************
*** 747,752 ****
  		_t = " INSTANCE\r\n";
  	if( doDragOp == DRAGOP_COPY)
! 		_t = " PASTE\r\n";
! 
  	MGATREECTRL_LOGEVENT( _t);
  
--- 747,753 ----
  		_t = " INSTANCE\r\n";
  	if( doDragOp == DRAGOP_COPY)
! 		_t = " COPY\r\n";
! 	if( doDragOp == DRAGOP_MOVE)
! 		_t = " MOVE\r\n";
  	MGATREECTRL_LOGEVENT( _t);
  
***************
*** 809,812 ****
--- 810,817 ----
  	if( !ccpDroppedFCOs && !ccpDroppedFolders) return FALSE;
  
+ 	// ccpDroppedFCOs can't be null since every copier creates the Mga.MgaFCOs collection even if no element is added
+ 	// ccpDroppedFolders might be null i.e. GMEDoc does not create the Mga.MgaFolders collection
+ 	// when an fco is dragged from the GMEView to the ActiveBrowser
+ 
  	BOOL bRetVal=FALSE;
  
***************
*** 826,830 ****
  					// first move the selected folders. The order matters 
  					// since the NEWCHILD event must be the last one.
! 					COMTHROW( ccpTargetFolder->MoveFolders( ccpDroppedFolders, &ccpNewFolders));
  
  					// then move the selected fcos
--- 831,835 ----
  					// first move the selected folders. The order matters 
  					// since the NEWCHILD event must be the last one.
! 					if( ccpDroppedFolders) COMTHROW( ccpTargetFolder->MoveFolders( ccpDroppedFolders, &ccpNewFolders));
  
  					// then move the selected fcos
***************
*** 840,844 ****
  				{
  					CComPtr<IMgaFolders> ccpNewFolders;
! 					COMTHROW(ccpTargetFolder->CopyFolders(ccpDroppedFolders,&ccpNewFolders));
  
  					CComPtr<IMgaFCOs> ccpNewFCOs;
--- 845,849 ----
  				{
  					CComPtr<IMgaFolders> ccpNewFolders;
! 					if( ccpDroppedFolders) COMTHROW(ccpTargetFolder->CopyFolders(ccpDroppedFolders,&ccpNewFolders));
  
  					CComPtr<IMgaFCOs> ccpNewFCOs;