[GME-commit] GMESRC/GME/Gme GME.rc,1.120,1.121 GMEDoc.cpp,1.20,1.21 GMEDoc.h,1.7,1.8 GMEOLEData.cpp,1.15,1.16 GMEOLEData.h,1.6,1.7 GMEView.cpp,1.150,1.151 GMEView.h,1.60,1.61 resource.h,1.54,1.55

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jun 2 18:32:41 CDT 2004 

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

Modified Files:
	GME.rc GMEDoc.cpp GMEDoc.h GMEOLEData.cpp GMEOLEData.h 
	GMEView.cpp GMEView.h resource.h 
Log Message:
1.Copy Closure menu introduced.
2.CGMEClosureDataSource class added.


CVS User: zolmol

Index: GME.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** GME.rc	13 May 2004 10:03:42 -0000	1.120
--- GME.rc	2 Jun 2004 22:32:38 -0000	1.121
***************
*** 250,253 ****
--- 250,254 ----
          MENUITEM SEPARATOR
          MENUITEM "&Copy\tCtrl+C",               ID_EDIT_COPY
+         MENUITEM "C&opy Closure",               ID_EDIT_COPYCLOSURE
          MENUITEM "&Paste\tCtrl+V",              ID_EDIT_PASTE
          POPUP "Paste &Special"
***************
*** 348,351 ****
--- 349,353 ----
          MENUITEM SEPARATOR
          MENUITEM "Copy",                        ID_SELFCNTX_COPY
+         MENUITEM "Copy Closure",                ID_SELFCNTX_COPYCLOSURE
          MENUITEM "Paste",                       ID_SELFCNTX_PASTE
          POPUP "Paste Special"
***************
*** 465,468 ****
--- 467,471 ----
          MENUITEM SEPARATOR
          MENUITEM "Copy",                        ID_CNTX_COPY
+         MENUITEM "Copy Closure",                ID_CNTX_COPYCLOSURE
          MENUITEM "Delete",                      ID_CNTX_DELETE
          MENUITEM SEPARATOR
***************
*** 1314,1317 ****
--- 1317,1321 ----
      ID_FILE_PRINTALL        "Print all models in the document\nPrint All"
      IDC_PRINT_METAFILE      "Print the active document to a Metafile\nPrint to Metafile"
+     ID_EDIT_COPYCLOSURE     "Copy a closure of the selected objects to the Clipboard"
      ID_BUTTON32959          "Toggle Panning Window\nPanning Window"
  END

Index: GMEDoc.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** GMEDoc.cpp	9 Mar 2004 21:18:55 -0000	1.20
--- GMEDoc.cpp	2 Jun 2004 22:32:38 -0000	1.21
***************
*** 134,137 ****
--- 134,170 ----
  	pDataSource->CacheDescriptor(desc);
  	pDataSource->SetClipboard();
+ 	
+ }
+ 
+ void CGMEDoc::CopyClosureToClipboard( CGuiObjectList* list, CGuiAnnotatorList *annList, CGMEDataDescriptor* desc, CGMEView *view)
+ {
+ 	ASSERT( list && desc );
+ 
+ 	CComPtr<IMgaFCOs> fcos;
+ 	CreateFcoList( list, fcos, view);
+ 
+ 	CComPtr<IMgaClosure> cl;
+ 	CComObjPtr<IMgaFCOs> sel_fcos, top_fcos;
+ 	CComObjPtr<IMgaFolders> sel_folders, top_folders;
+ 	COMTHROW( cl.CoCreateInstance(L"Mga.MgaClosure") );
+ 	COMTHROW( cl->SelectiveClosure( fcos, 0, PutOut( sel_fcos), PutOut( sel_folders), PutOut( top_fcos), PutOut( top_folders), 0 ));
+ 
+ 	if ( sel_fcos || sel_folders) // if both null the operation is not needed (either dumped to file already or unsuccessful)
+ 	{
+ 		CGMEClosureDataSource * pDataSource = new CGMEClosureDataSource( theApp.mgaProject);
+ 
+ 		if ( sel_fcos)		pDataSource->SetNodes( sel_fcos);
+ 		if ( sel_folders)	pDataSource->SetFolders( sel_folders);
+ 		
+ 		if ( top_fcos)		pDataSource->SetTopNodes( top_fcos);
+ 		if ( top_folders)	pDataSource->SetTopNodes( top_folders);
+ 
+ 		CComPtr<IMgaRegNodes> anns; 
+ 		CreateAnnotationList( annList, anns, view);
+ 		pDataSource->SetAnnotations( anns);
+ 		pDataSource->CacheDescriptor( desc);
+ 		pDataSource->SetClipboard();
+ 		pDataSource->FlushClipboard();
+ 	}
  }
  

Index: GMEDoc.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GMEDoc.h	9 Mar 2004 21:18:55 -0000	1.7
--- GMEDoc.h	2 Jun 2004 22:32:38 -0000	1.8
***************
*** 46,49 ****
--- 46,50 ----
  	static bool CreateFcoList(CGuiObjectList* list,CComPtr<IMgaFCOs> &fcos,CGMEView *view);
  	static bool CreateAnnotationList(CGuiAnnotatorList* list,CComPtr<IMgaRegNodes> &anns,CGMEView *view);
+ 	static void CopyClosureToClipboard(CGuiObjectList* list,CGuiAnnotatorList *annList,CGMEDataDescriptor* desc,CGMEView *view);
  	static void CopyToClipboard(CGuiObjectList* list,CGuiAnnotatorList *annList,CGMEDataDescriptor* desc,CGMEView *view);
  	static DROPEFFECT DoDragDrop(CGuiObjectList* list, CGuiAnnotatorList *annList, CGMEDataDescriptor* desc,

Index: GMEOLEData.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** GMEOLEData.cpp	24 May 2004 14:35:13 -0000	1.15
--- GMEOLEData.cpp	2 Jun 2004 22:32:38 -0000	1.16
***************
*** 201,205 ****
  }
  
! bool CGMEDataSource::IsXMLDataAvaliable(COleDataObject *pDataObject)
  {
  	ASSERT( pDataObject != NULL );
--- 201,205 ----
  }
  
! bool CGMEDataSource::IsXMLDataAvailable(COleDataObject *pDataObject)
  {
  	ASSERT( pDataObject != NULL );
***************
*** 237,244 ****
  		{
  			c = memfile->Read(buff, buffsize);
! 			
! 			UINT new_c = 0;		// addition by ZolMol
  			while( buff[new_c] != 0 && new_c < c) ++new_c;
! 			c = new_c;			// end
  
  			file.Write(buff, c);
--- 237,244 ----
  		{
  			c = memfile->Read(buff, buffsize);
! 
! 			UINT new_c = 0; // addition by ZolMol
  			while( buff[new_c] != 0 && new_c < c) ++new_c;
! 			c = new_c;		// end
  
  			file.Write(buff, c);
***************
*** 329,335 ****
  
  			CComObjPtr<IMgaFCOs> fcos;
  			COMTHROW( ::QueryInterface(data, fcos) );
  
! 			COMTHROW( dumper->DumpFCOs(fcos, PutInBstr(filename)) );
  
  			CFile file;
--- 329,419 ----
  
  			CComObjPtr<IMgaFCOs> fcos;
+ 			COMTHROW( ::QueryInterface( data, fcos) );
+ 
+ 			CComObjPtr<IMgaFolders> folds;
+ 			COMTHROW( ::QueryInterface( folders, folds) );
+ 
+ 			COMTHROW( dumper->DumpFCOs(fcos, folds, PutInBstr(filename)) );
+ 
+ 			CFile file;
+ 			if( file.Open(filename, CFile::modeRead | CFile::typeBinary) == 0 )
+ 				return FALSE;
+ 			
+ 			const int buffsize = 10240;
+ 			unsigned char buff[buffsize];
+ 			UINT c;
+ 			do
+ 			{
+ 				c = file.Read(buff, buffsize);
+ 				pFile->Write(buff, c);
+ 			} while( c == buffsize );
+ 
+ 			buff[0] = 0;
+ 			pFile->Write(buff, 1);
+ 
+ 			file.Close();
+ 			CFile::Remove(filename);
+ 		}
+ 		catch(hresult_exception &)
+ 		{
+ 			return FALSE;
+ 		}
+ 		catch(CFileException &)
+ 		{
+ 			return FALSE;
+ 		}
+ 
+ 		return TRUE;
+ 	}
+ 
+ 	return FALSE;
+ }
+ 
+ // ****************************************************************************************************
+ // *********************************   CGMEClosureDataSource  *****************************************
+ // ****************************************************************************************************
+ BOOL CGMEClosureDataSource::OnRenderFileData(LPFORMATETC lpFormatEtc, CFile* pFile)
+ {
+ 	if( lpFormatEtc->cfFormat == CF_TEXT )
+ 	{
+ 		ASSERT( pFile != NULL );
+ 
+ 		// TODO: we have to dump it directly to the shared memory file
+ 
+ 		try
+ 		{
+ 			char *fname = _tempnam("c:\\temp", "tmp");
+ 			CString filename = fname;
+ 			free(fname);
+ 		
+ 			CComPtr<IMgaDumper> dumper;
+ 			COMTHROW( dumper.CoCreateInstance(L"Mga.MgaDumper") );
+ 
+ 			CComObjPtr<IMgaFCOs> fcos;
  			COMTHROW( ::QueryInterface(data, fcos) );
  
! 			CComObjPtr<IMgaFolders> fols;
! 			COMTHROW( ::QueryInterface( folders, fols) );
! 
! 			bool is_top_set = false;
! 			CComObjPtr<IMgaFCOs> top_fcos;
! 			CComObjPtr<IMgaFolders> top_folds;
! 
! 			if ( m_topFcos)
! 			{
! 				COMTHROW( ::QueryInterface( m_topFcos, top_fcos) );
! 				is_top_set = true;
! 			}
! 
! 			if ( m_topFolders)
! 			{
! 				COMTHROW( ::QueryInterface( m_topFolders, top_folds) );
! 				is_top_set = true;
! 			}
! 
! 			if ( is_top_set)
! 				COMTHROW( dumper->DumpClosR( fcos, fols, PutInBstr( filename), top_fcos, top_folds) );
! 			else // if top objects are not set dump starting from RootFolder
! 				COMTHROW( dumper->DumpClos( fcos, fols, PutInBstr( filename)) );
  
  			CFile file;
***************
*** 398,401 ****
--- 482,496 ----
  	if( pThis->data != NULL )
  		return pThis->data.QueryInterface(p);
+ 
+ 	return S_OK;
+ }
+ 
+ STDMETHODIMP CGMEDataSource::XMgaDataSource::get_Folders(IUnknown **p)
+ {
+ 	METHOD_PROLOGUE(CGMEDataSource, MgaDataSource)
+ 	CHECK_OUT(p);
+ 
+ 	if( pThis->folders != NULL )
+ 		return pThis->folders.QueryInterface(p);
  
  	return S_OK;

Index: GMEOLEData.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEData.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GMEOLEData.h	7 Feb 2003 15:11:23 -0000	1.6
--- GMEOLEData.h	2 Jun 2004 22:32:38 -0000	1.7
***************
*** 44,47 ****
--- 44,48 ----
  	CComPtr<IMgaProject> project;
  	CComPtr<IUnknown> data;
+ 	CComPtr<IUnknown> folders; // by Zolmol
  	CComPtr<IUnknown> regdata;
  
***************
*** 52,55 ****
--- 53,57 ----
  public:
  	void SetNodes(IMgaFCOs *fcos) { data = fcos; }
+ 	void SetFolders(IMgaFolders *objs) { folders = objs; } // by Zolmol
  	void SetMetaRole(IMgaMetaRole *metaRole) { data = metaRole; }
  	void SetAnnotations(IMgaRegNodes *regs) { regdata = regs; }
***************
*** 59,63 ****
  
  	static bool IsGmeNativeDataAvailable(COleDataObject *pDataObject, IMgaProject *project);
! 	static bool IsXMLDataAvaliable(COleDataObject *pDataObject);
  	static bool ParseXMLData(COleDataObject *pDataObject, IMgaObject *target);
  
--- 61,65 ----
  
  	static bool IsGmeNativeDataAvailable(COleDataObject *pDataObject, IMgaProject *project);
! 	static bool IsXMLDataAvailable(COleDataObject *pDataObject);
  	static bool ParseXMLData(COleDataObject *pDataObject, IMgaObject *target);
  
***************
*** 72,79 ****
--- 74,103 ----
  	BEGIN_INTERFACE_PART(MgaDataSource, IMgaDataSource)
  		STDMETHOD(get_Data)(IUnknown **p);
+ 		STDMETHOD(get_Folders)(IUnknown **p);
  		STDMETHOD(get_RegistryData)(IUnknown **p);
  		STDMETHOD(get_Project)(IUnknown **p);
  	END_INTERFACE_PART(MgaDataSource)
  };
+ 
+ 
+ class CGMEClosureDataSource : public CGMEDataSource // by Zolmol
+ {
+ public:
+ 	CGMEClosureDataSource(IMgaProject *p) : CGMEDataSource( p) {}
+ 
+ 	~CGMEClosureDataSource() {}
+ 
+ protected:
+ 	CComPtr<IUnknown> m_topFcos;
+ 	CComPtr<IUnknown> m_topFolders;
+ 
+ public:
+ 	void SetTopNodes(IMgaFCOs *objs) { m_topFcos = objs; }
+ 	void SetTopNodes(IMgaFolders *objs) { m_topFolders = objs; }
+ 
+ protected:
+ 	virtual BOOL OnRenderFileData(LPFORMATETC lpFormatEtc, CFile* pFile);
+ };
+ 
  
  #endif // whole file

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** GMEView.cpp	27 May 2004 21:48:10 -0000	1.150
--- GMEView.cpp	2 Jun 2004 22:32:38 -0000	1.151
***************
*** 271,275 ****
--- 271,277 ----
  	ON_COMMAND(ID_CNTX_ATTRIBUTES, OnCntxAttributes)
  	ON_COMMAND(ID_EDIT_COPY, OnEditCopy)
+ 	ON_COMMAND(ID_EDIT_COPYCLOSURE, OnEditCopyClosure)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateEditCopy)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_COPYCLOSURE, OnUpdateEditCopyClosure)
  	ON_COMMAND(ID_EDIT_CUT, OnEditCut)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_CUT, OnUpdateEditCut)
***************
*** 277,284 ****
--- 279,289 ----
  	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, OnUpdateEditPaste)
  	ON_COMMAND(ID_CNTX_COPY, OnCntxCopy)
+ 	ON_COMMAND(ID_CNTX_COPYCLOSURE, OnCntxCopyClosure)
  	ON_COMMAND(ID_CNTX_CUT, OnCntxCut)
  	ON_COMMAND(ID_CNTX_DELETE, OnCntxDelete)
  	ON_COMMAND(ID_SELFCNTX_COPY, OnSelfcntxCopy)
  	ON_UPDATE_COMMAND_UI(ID_SELFCNTX_COPY, OnUpdateSelfcntxCopy)
+ 	ON_COMMAND(ID_SELFCNTX_COPYCLOSURE, OnSelfcntxCopyClosure)
+ 	ON_UPDATE_COMMAND_UI(ID_SELFCNTX_COPYCLOSURE, OnUpdateSelfcntxCopyClosure)
  	ON_COMMAND(ID_SELFCNTX_CUT, OnSelfcntxCut)
  	ON_UPDATE_COMMAND_UI(ID_SELFCNTX_CUT, OnUpdateSelfcntxCut)
***************
*** 2448,2452 ****
  			ok = DoPasteNative(pDataObject,drag,move,reference,derive,instance,ref,pt);
  		}
! 		else if( CGMEDataSource::IsXMLDataAvaliable(pDataObject) )
  		{
  			ok = CGMEDataSource::ParseXMLData(pDataObject, currentModel);
--- 2453,2457 ----
  			ok = DoPasteNative(pDataObject,drag,move,reference,derive,instance,ref,pt);
  		}
! 		else if( CGMEDataSource::IsXMLDataAvailable(pDataObject) )
  		{
  			ok = CGMEDataSource::ParseXMLData(pDataObject, currentModel);
***************
*** 4022,4026 ****
  		}
  	}
! 	else if( isType && CGMEDataSource::IsXMLDataAvaliable(pDataObject) )
  		return DROPEFFECT_COPY;
  
--- 4027,4031 ----
  		}
  	}
! 	else if( isType && CGMEDataSource::IsXMLDataAvailable(pDataObject) )
  		return DROPEFFECT_COPY;
  
***************
*** 4047,4051 ****
  //	if(!pDataObject->IsDataAvailable(CGMEDataSource::cfGMEDesc))
  	{
! 		if(isType && CGMEDataSource::IsXMLDataAvaliable(pDataObject))
  			return DROPEFFECT_COPY;
  
--- 4052,4056 ----
  //	if(!pDataObject->IsDataAvailable(CGMEDataSource::cfGMEDesc))
  	{
! 		if(isType && CGMEDataSource::IsXMLDataAvailable(pDataObject))
  			return DROPEFFECT_COPY;
  
***************
*** 4509,4512 ****
--- 4514,4532 ----
  }
  
+ void CGMEView::OnEditCopyClosure()
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditCopyClosure in "+path+name+"\r\n");
+ 	if(selected.GetCount() > 0) {
+ 		GMEEVENTLOG_GUIOBJS(selected);
+ 		GMEEVENTLOG_GUIANNOTATORS(selectedAnnotations);
+ 		CPoint pt = CPoint(0,0);
+ 		CRectList rects, annRects;
+ 		CGuiObject::GetRectList(selected,rects);
+ 		CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
+ 		CGMEDataDescriptor desc(rects,annRects,pt,pt);
+ 		GetDocument()->CopyClosureToClipboard( &selected, &selectedAnnotations, &desc, this);
+ 	}
+ }
+ 
  void CGMEView::OnUpdateEditCopy(CCmdUI* pCmdUI)
  {
***************
*** 4514,4517 ****
--- 4534,4542 ----
  }
  
+ void CGMEView::OnUpdateEditCopyClosure(CCmdUI* pCmdUI)
+ {
+ 	OnUpdateEditCopy( pCmdUI);
+ }
+ 
  void CGMEView::OnEditCut()
  {
***************
*** 4554,4558 ****
  	BOOL bEnable = isType && dataObj.AttachClipboard() &&
  		((CGMEDataSource::IsGmeNativeDataAvailable(&dataObj,theApp.mgaProject)) ||
! 		(CGMEDataSource::IsXMLDataAvaliable(&dataObj))
  		);
  
--- 4579,4583 ----
  	BOOL bEnable = isType && dataObj.AttachClipboard() &&
  		((CGMEDataSource::IsGmeNativeDataAvailable(&dataObj,theApp.mgaProject)) ||
! 		(CGMEDataSource::IsXMLDataAvailable(&dataObj))
  		);
  
***************
*** 4594,4597 ****
--- 4619,4657 ----
  }
  
+ void CGMEView::OnCntxCopyClosure()
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxCopyClosure in "+path+name+"\r\n");
+ 	if(contextSelection) {
+ 		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
+ 		if(guiObj) {
+ 			CGMEEventLogger::LogGMEEvent("    "+guiObj->GetName()+" "+guiObj->GetID()+"\r\n");
+ 			CGuiObjectList list;
+ 			CGuiAnnotatorList dummyList;
+ 			list.AddTail(guiObj);
+ 			CPoint pt = CPoint(0,0);
+ 			CRectList rects;
+ 			CGuiObject::GetRectList(list,rects);
+ 			CRectList dummyAnnList;
+ 			CGMEDataDescriptor desc(rects,dummyAnnList,pt,pt);
+ 			GetDocument()->CopyClosureToClipboard( &list, &dummyList, &desc, this);
+ 		}
+ 		contextSelection = 0;
+ 	}
+ 	else if (contextAnnotation) {
+ 		CGMEEventLogger::LogGMEEvent("    "+contextAnnotation->GetName()+"/r/n");
+ 		CGuiObjectList dummyList;
+ 		CGuiAnnotatorList list;
+ 		list.AddTail(contextAnnotation);
+ 		CPoint pt = CPoint(0,0);
+ 		CRectList rects;
+ 		CGuiAnnotator::GetRectList(list,rects);
+ 		CRectList dummyObjList;
+ 		CGMEDataDescriptor desc(dummyObjList,rects,pt,pt);
+ 		GetDocument()->CopyClosureToClipboard(&dummyList,&list,&desc,this);
+ 		contextAnnotation = 0;
+ 	}
+ }
+ 
+ 
  void CGMEView::OnCntxCut()
  {
***************
*** 4671,4674 ****
--- 4731,4745 ----
  {
  	OnUpdateEditCopy(pCmdUI);
+ }
+ 
+ void CGMEView::OnSelfcntxCopyClosure()
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnSelfcntxCopyClosure in "+path+name+"\r\n");
+ 	OnEditCopyClosure();
+ }
+ 
+ void CGMEView::OnUpdateSelfcntxCopyClosure(CCmdUI* pCmdUI)
+ {
+ 	OnUpdateEditCopyClosure(pCmdUI);
  }
  

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** GMEView.h	17 May 2004 17:50:33 -0000	1.60
--- GMEView.h	2 Jun 2004 22:32:38 -0000	1.61
***************
*** 292,295 ****
--- 292,297 ----
  	afx_msg void OnEditCopy();
  	afx_msg void OnUpdateEditCopy(CCmdUI* pCmdUI);
+ 	afx_msg void OnEditCopyClosure();
+ 	afx_msg void OnUpdateEditCopyClosure(CCmdUI* pCmdUI);
  	afx_msg void OnEditCut();
  	afx_msg void OnUpdateEditCut(CCmdUI* pCmdUI);
***************
*** 297,304 ****
--- 299,309 ----
  	afx_msg void OnUpdateEditPaste(CCmdUI* pCmdUI);
  	afx_msg void OnCntxCopy();
+ 	afx_msg void OnCntxCopyClosure();
  	afx_msg void OnCntxCut();
  	afx_msg void OnCntxDelete();
  	afx_msg void OnSelfcntxCopy();
  	afx_msg void OnUpdateSelfcntxCopy(CCmdUI* pCmdUI);
+ 	afx_msg void OnSelfcntxCopyClosure();
+ 	afx_msg void OnUpdateSelfcntxCopyClosure(CCmdUI* pCmdUI);
  	afx_msg void OnSelfcntxCut();
  	afx_msg void OnUpdateSelfcntxCut(CCmdUI* pCmdUI);

Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** resource.h	12 May 2004 17:48:56 -0000	1.54
--- resource.h	2 Jun 2004 22:32:38 -0000	1.55
***************
*** 296,299 ****
--- 296,302 ----
  #define ID_VIEW_PANNWIN                 32958
  #define ID_BUTTON32959                  32959
+ #define ID_SELFCNTX_COPYCLOSURE         32960
+ #define ID_CNTX_COPYCLOSURE             32961
+ #define ID_EDIT_COPYCLOSURE             32962
  #define IDC_BTNSELECT                   33000
  #define IDC_BTNDESELECT                 33001
***************
*** 315,319 ****
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        208
! #define _APS_NEXT_COMMAND_VALUE         32960
  #define _APS_NEXT_CONTROL_VALUE         1091
  #define _APS_NEXT_SYMED_VALUE           114
--- 318,322 ----
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        208
! #define _APS_NEXT_COMMAND_VALUE         32963
  #define _APS_NEXT_CONTROL_VALUE         1091
  #define _APS_NEXT_SYMED_VALUE           114

More information about the GME-commit mailing list