[GME-commit] GMESRC/GME/Gme GMEView.h,1.64,1.65 resource.h,1.62,1.63 GME.rc,1.134,1.135

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

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

Modified Files:
	GMEView.h resource.h GME.rc 
Log Message:
Paste Closure/Smart introduced.


CVS User: zolmol

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** GMEView.h	12 Nov 2004 15:09:49 -0000	1.64
--- GMEView.h	5 Jan 2005 20:06:25 -0000	1.65
***************
*** 195,199 ****
  	void PasteAnnotations(CComPtr<IMgaModel> &targetModel, CComPtr<IMgaRegNodes> &regNodes, CComPtr<IMgaRegNodes> &newRegNodes,bool isMove);
  	void CopyRegTree(CComPtr<IMgaRegNode> &regNode, CComPtr<IMgaRegNode> &newNode);
! 	bool DoPasteItem(COleDataObject* pDataObject,bool drag = false,bool move = false,bool reference = false,bool derive = false,bool instance = false,CGuiObject *ref = 0,CPoint pt = CPoint(0,0));
  	bool DoPasteNative(COleDataObject *pDataObject,bool drag,bool move,bool reference,bool derive,bool instance,CGuiObject *ref,CPoint pt);
  	void ChangeAspect(CString aspName);
--- 195,199 ----
  	void PasteAnnotations(CComPtr<IMgaModel> &targetModel, CComPtr<IMgaRegNodes> &regNodes, CComPtr<IMgaRegNodes> &newRegNodes,bool isMove);
  	void CopyRegTree(CComPtr<IMgaRegNode> &regNode, CComPtr<IMgaRegNode> &newNode);
! 	bool DoPasteItem(COleDataObject* pDataObject,bool drag = false,bool move = false,bool reference = false,bool derive = false,bool instance = false,bool closure = false,CGuiObject *ref = 0,CPoint pt = CPoint(0,0));
  	bool DoPasteNative(COleDataObject *pDataObject,bool drag,bool move,bool reference,bool derive,bool instance,CGuiObject *ref,CPoint pt);
  	void ChangeAspect(CString aspName);
***************
*** 362,368 ****
--- 362,370 ----
  	afx_msg void OnEditPastespecialAsreference();
  	afx_msg void OnEditPastespecialAssubtype();
+ 	afx_msg void OnEditPastespecialAsclosure();
  	afx_msg void OnUpdateEditPastespecialAsinstance(CCmdUI* pCmdUI);
  	afx_msg void OnUpdateEditPastespecialAsreference(CCmdUI* pCmdUI);
  	afx_msg void OnUpdateEditPastespecialAssubtype(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditPastespecialAsclosure(CCmdUI* pCmdUI);
  	afx_msg void OnCntxPastespecialAsinstance();
  	afx_msg void OnUpdateCntxPastespecialAsinstance(CCmdUI* pCmdUI);
***************
*** 371,374 ****
--- 373,378 ----
  	afx_msg void OnCntxPastespecialAssubtype();
  	afx_msg void OnUpdateCntxPastespecialAssubtype(CCmdUI* pCmdUI);
+ 	afx_msg void OnCntxPastespecialAsclosure();
+ 	afx_msg void OnUpdateCntxPastespecialAsclosure(CCmdUI* pCmdUI);
  	afx_msg void OnCntxRedirectionpaste();
  	afx_msg void OnUpdateCntxRedirectionpaste(CCmdUI* pCmdUI);

Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** resource.h	12 Nov 2004 15:09:48 -0000	1.62
--- resource.h	5 Jan 2005 20:06:25 -0000	1.63
***************
*** 336,339 ****
--- 336,341 ----
  #define ID_VIEW_REFRESH_SOURCECONTROL   32972
  #define ID_CNTX_CHECK                   32973
+ #define ID_EDIT_PASTESPECIAL_ASCLOSURE  32974
+ #define ID_CNTX_PASTESPECIAL_ASCLOSURE  32975
  #define IDC_BTNSELECT                   33000
  #define IDC_BTNDESELECT                 33001
***************
*** 355,359 ****
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        211
! #define _APS_NEXT_COMMAND_VALUE         32974
  #define _APS_NEXT_CONTROL_VALUE         1107
  #define _APS_NEXT_SYMED_VALUE           115
--- 357,361 ----
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        211
! #define _APS_NEXT_COMMAND_VALUE         32976
  #define _APS_NEXT_CONTROL_VALUE         1107
  #define _APS_NEXT_SYMED_VALUE           115

Index: GME.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** GME.rc	12 Nov 2004 15:09:49 -0000	1.134
--- GME.rc	5 Jan 2005 20:06:25 -0000	1.135
***************
*** 267,270 ****
--- 267,272 ----
              MENUITEM "As Instance",                 ID_EDIT_PASTESPECIAL_ASINSTANCE
  
+             MENUITEM "Closure/Smart",               ID_EDIT_PASTESPECIAL_ASCLOSURE
+ 
          END
          MENUITEM "&Delete",                     ID_EDIT_DELETE
***************
*** 372,375 ****
--- 374,379 ----
              MENUITEM "As Instance",                 ID_CNTX_PASTESPECIAL_ASINSTANCE
  
+             MENUITEM "Closure/Smart",               ID_CNTX_PASTESPECIAL_ASCLOSURE
+ 
          END
          MENUITEM "Delete",                      ID_SELFCNTX_DELETE
***************
*** 1426,1430 ****
  BEGIN
      ID_CNTX_INTERPRET       "Interpret selected models"
-     ID_CNTX_CHECK			"Check selected or current model"
      ID_EDIT_SYNC            "Synchronize object positions between aspects\nSynchronize aspects"
      ID_EDIT_SELECTALL       "Select all objects in current aspect\nSelect All"
--- 1430,1433 ----
***************
*** 1437,1440 ****
--- 1440,1449 ----
  STRINGTABLE DISCARDABLE 
  BEGIN
+     ID_EDIT_COPYCLOSURE     "Copy a closure of the selected objects to the Clipboard"
+     ID_CNTX_CHECK           "Check selected or current model"
+ END
+ 
+ STRINGTABLE DISCARDABLE 
+ BEGIN
      ID_FILE_ABORTPROJECT    "Abort Project\nAbort"
      ID_EDIT_PASTESPECIAL    "Paste Special"
***************
*** 1452,1460 ****
      IDC_PRINT_METAFILE      "Print the active document to a Metafile\nPrint to Metafile"
      ID_BUTTON32959          "Toggle Panning Window\nPanning Window"
- END
- 
- STRINGTABLE DISCARDABLE 
- BEGIN
-     ID_EDIT_COPYCLOSURE     "Copy a closure of the selected objects to the Clipboard"
  END
  
--- 1461,1464 ----