[GME-commit] GMESRC/GME/Gme GMEApp.cpp,1.116,1.117 GMEOLEData.cpp,1.16,1.17

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

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

Modified Files:
	GMEApp.cpp GMEOLEData.cpp 
Log Message:
Flushing native clipboard data on CloseProject when copied from activebrowser.

Checking if data and folder members are set in the CGmeDataSource::OnRenderFileData, CGmeClosureDataSource::OnRenderFileData.


CVS User: zolmol

Index: GMEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** GMEApp.cpp	18 May 2004 13:30:59 -0000	1.116
--- GMEApp.cpp	7 Jun 2004 15:33:20 -0000	1.117
***************
*** 471,475 ****
  	CWaitCursor wait();
  	
! 	if(CGMEDataSource::myData)
  		OleFlushClipboard();
  	
--- 471,475 ----
  	CWaitCursor wait();
  	
! 	if(CGMEDataSource::myData) // it is true when object copied to the clipboard from the view
  		OleFlushClipboard();
  	

Index: GMEOLEData.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** GMEOLEData.cpp	2 Jun 2004 22:32:38 -0000	1.16
--- GMEOLEData.cpp	7 Jun 2004 15:33:20 -0000	1.17
***************
*** 329,336 ****
  
  			CComObjPtr<IMgaFCOs> fcos;
! 			COMTHROW( ::QueryInterface( data, fcos) );
  
  			CComObjPtr<IMgaFolders> folds;
! 			COMTHROW( ::QueryInterface( folders, folds) );
  
  			COMTHROW( dumper->DumpFCOs(fcos, folds, PutInBstr(filename)) );
--- 329,338 ----
  
  			CComObjPtr<IMgaFCOs> fcos;
! 			if ( data) // check whether it is set
! 				COMTHROW( ::QueryInterface( data, fcos) );
  
  			CComObjPtr<IMgaFolders> folds;
! 			if ( folders) // check whether it is set
! 				COMTHROW( ::QueryInterface( folders, folds) );
  
  			COMTHROW( dumper->DumpFCOs(fcos, folds, PutInBstr(filename)) );
***************
*** 391,398 ****
  
  			CComObjPtr<IMgaFCOs> fcos;
! 			COMTHROW( ::QueryInterface(data, fcos) );
  
  			CComObjPtr<IMgaFolders> fols;
! 			COMTHROW( ::QueryInterface( folders, fols) );
  
  			bool is_top_set = false;
--- 393,402 ----
  
  			CComObjPtr<IMgaFCOs> fcos;
! 			if ( data) // is it set?
! 				COMTHROW( ::QueryInterface(data, fcos) );
  
  			CComObjPtr<IMgaFolders> fols;
! 			if ( folders) // is it set?
! 				COMTHROW( ::QueryInterface( folders, fols) );
  
  			bool is_top_set = false;