[GME-commit] GMESRC/GME/Gme GMEOLEData.cpp,1.20,1.21 GMEView.cpp,1.161,1.162

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

Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv4290/Gme

Modified Files:
	GMEOLEData.cpp GMEView.cpp 
Log Message:
Making possible copy/paste operations for Annotations.


CVS User: zolmol

Index: GMEOLEData.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** GMEOLEData.cpp	28 Sep 2004 22:44:07 -0000	1.20
--- GMEOLEData.cpp	13 Jan 2005 21:13:47 -0000	1.21
***************
*** 3,7 ****
  #include "afxcoll.h"
  #include "afxtempl.h"
- 
  #include "meta.h"
  #include "mga.h"
--- 3,6 ----
***************
*** 379,383 ****
  				COMTHROW( ::QueryInterface( folders, folds) );
  
! 			COMTHROW( dumper->DumpFCOs(fcos, folds, PutInBstr(filename)) );
  
  			CFile file;
--- 378,386 ----
  				COMTHROW( ::QueryInterface( folders, folds) );
  
! 			CComObjPtr<IMgaRegNodes> regd;
! 			if ( regdata) // check whether it is set
! 				COMTHROW( ::QueryInterface( regdata, regd) );
! 
! 			COMTHROW( dumper->DumpFCOs( project, fcos, folds, regd, PutInBstr(filename)) );
  
  			CFile file;

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** GMEView.cpp	12 Jan 2005 18:03:33 -0000	1.161
--- GMEView.cpp	13 Jan 2005 21:13:47 -0000	1.162
***************
*** 4547,4551 ****
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditCopy in "+path+name+"\r\n");
! 	if(selected.GetCount() > 0) {
  		GMEEVENTLOG_GUIOBJS(selected);
  		GMEEVENTLOG_GUIANNOTATORS(selectedAnnotations);
--- 4547,4551 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditCopy in "+path+name+"\r\n");
! 	if(selected.GetCount() + selectedAnnotations.GetCount() > 0) {
  		GMEEVENTLOG_GUIOBJS(selected);
  		GMEEVENTLOG_GUIANNOTATORS(selectedAnnotations);
***************
*** 4591,4605 ****
  void CGMEView::OnUpdateEditCopy(CCmdUI* pCmdUI)
  {
! 	pCmdUI->Enable(selected.GetCount() > 0);
  }
  
  void CGMEView::OnUpdateEditCopyClosure(CCmdUI* pCmdUI)
  {
! 	OnUpdateEditCopy( pCmdUI);
  }
  
  void CGMEView::OnUpdateEditCopySmart(CCmdUI* pCmdUI)
  {
! 	OnUpdateEditCopy( pCmdUI);
  }
  
--- 4591,4605 ----
  void CGMEView::OnUpdateEditCopy(CCmdUI* pCmdUI)
  {
! 	pCmdUI->Enable(selected.GetCount() + selectedAnnotations.GetCount() > 0);
  }
  
  void CGMEView::OnUpdateEditCopyClosure(CCmdUI* pCmdUI)
  {
! 	pCmdUI->Enable(selected.GetCount() > 0);
  }
  
  void CGMEView::OnUpdateEditCopySmart(CCmdUI* pCmdUI)
  {
! 	pCmdUI->Enable(selected.GetCount() > 0);
  }
  
***************
*** 4607,4611 ****
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditCut in "+path+name+"\r\n");
! 	if(isType && selected.GetCount() > 0) {
  		GMEEVENTLOG_GUIOBJS(selected);
  		GMEEVENTLOG_GUIANNOTATORS(selectedAnnotations);
--- 4607,4611 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditCut in "+path+name+"\r\n");
! 	if(isType && selected.GetCount() + selectedAnnotations.GetCount() > 0) {
  		GMEEVENTLOG_GUIOBJS(selected);
  		GMEEVENTLOG_GUIANNOTATORS(selectedAnnotations);
***************
*** 4625,4629 ****
  void CGMEView::OnUpdateEditCut(CCmdUI* pCmdUI)
  {
! 	pCmdUI->Enable(isType && selected.GetCount() > 0);
  }
  
--- 4625,4629 ----
  void CGMEView::OnUpdateEditCut(CCmdUI* pCmdUI)
  {
! 	pCmdUI->Enable(isType && selected.GetCount() + selectedAnnotations.GetCount() > 0);
  }