[GME-commit] GMESRC/GME/Gme GME.rc,1.140,1.141 GMEDoc.cpp,1.28,1.29 GMEOLEData.cpp,1.22,1.23 GMEOLEData.h,1.9,1.10 GMEView.cpp,1.171,1.172 GMEView.h,1.68,1.69 resource.h,1.65,1.66

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Tue Jul 19 18:47:03 CDT 2005 

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv29316

Modified Files:
	GME.rc GMEDoc.cpp GMEOLEData.cpp GMEOLEData.h GMEView.cpp 
	GMEView.h resource.h 
Log Message:
For new smart copy.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEOLEData.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEData.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GMEOLEData.h	27 Sep 2004 22:01:39 -0000	1.9
--- GMEOLEData.h	19 Jul 2005 17:47:01 -0000	1.10
***************
*** 61,65 ****
  	static bool IsGmeNativeDataAvailable(COleDataObject *pDataObject, IMgaProject *project);
  	static bool IsXMLDataAvailable(COleDataObject *pDataObject);
! 	static bool ParseXMLData(COleDataObject *pDataObject, IMgaObject *target);
  	static CComPtr<IGMEOLEApp> get_GME(CComObjPtr<IMgaProject> project);
  
--- 61,65 ----
  	static bool IsGmeNativeDataAvailable(COleDataObject *pDataObject, IMgaProject *project);
  	static bool IsXMLDataAvailable(COleDataObject *pDataObject);
! 	static bool ParseXMLData(COleDataObject *pDataObject, IMgaObject *target, bool merge);
  	static CComPtr<IGMEOLEApp> get_GME(CComObjPtr<IMgaProject> project);
  

Index: GMEView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** GMEView.cpp	7 Jul 2005 19:16:24 -0000	1.171
--- GMEView.cpp	19 Jul 2005 17:47:01 -0000	1.172
***************
*** 4,8 ****
  #include "stdafx.h"
  #include "GMEApp.h"
- 
  #include <slist>
  #include <math.h>
--- 4,7 ----
***************
*** 347,354 ****
--- 346,357 ----
  	ON_COMMAND(ID_EDIT_PASTESPECIAL_ASSUBTYPE, OnEditPastespecialAssubtype)
  	ON_COMMAND(ID_EDIT_PASTESPECIAL_ASCLOSURE, OnEditPastespecialAsclosure)
+ 	ON_COMMAND(ID_EDIT_PASTESPECIAL_SMART_ADDITIVE, OnEditPastespecialAdditive)
+ 	ON_COMMAND(ID_EDIT_PASTESPECIAL_SMART_MERGE, OnEditPastespecialMerge)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASINSTANCE, OnUpdateEditPastespecialAsinstance)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASREFERENCE, OnUpdateEditPastespecialAsreference)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASSUBTYPE, OnUpdateEditPastespecialAssubtype)
  	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_ASCLOSURE, OnUpdateEditPastespecialAsclosure)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_SMART_ADDITIVE, OnUpdateEditPastespecialAdditive)
+ 	ON_UPDATE_COMMAND_UI(ID_EDIT_PASTESPECIAL_SMART_MERGE, OnUpdateEditPastespecialMerge)
  	ON_COMMAND(ID_CNTX_PASTESPECIAL_ASINSTANCE, OnCntxPastespecialAsinstance)
  	ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_ASINSTANCE, OnUpdateCntxPastespecialAsinstance)
***************
*** 359,362 ****
--- 362,369 ----
  	ON_COMMAND(ID_CNTX_PASTESPECIAL_ASCLOSURE, OnCntxPastespecialAsclosure)
  	ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_ASCLOSURE, OnUpdateCntxPastespecialAsclosure)
+ 	ON_COMMAND(ID_CNTX_PASTESPECIAL_SMART_ADDITIVE, OnCntxPastespecialAdditive)
+ 	ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_SMART_ADDITIVE, OnUpdateCntxPastespecialAdditive)
+ 	ON_COMMAND(ID_CNTX_PASTESPECIAL_SMART_MERGE, OnCntxPastespecialMerge)
+ 	ON_UPDATE_COMMAND_UI(ID_CNTX_PASTESPECIAL_SMART_MERGE, OnUpdateCntxPastespecialMerge)
  	ON_COMMAND(ID_CNTX_REDIRECTIONPASTE, OnCntxRedirectionpaste)
  	ON_UPDATE_COMMAND_UI(ID_CNTX_REDIRECTIONPASTE, OnUpdateCntxRedirectionpaste)
***************
*** 2471,2475 ****
  
  
! bool CGMEView::DoPasteItem(COleDataObject* pDataObject,bool drag,bool move,bool reference,bool derive,bool instance,bool closure,CGuiObject *ref,CPoint pt)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::DoPasteItem");
--- 2478,2482 ----
  
  
! bool CGMEView::DoPasteItem(COleDataObject* pDataObject,bool drag,bool move,bool reference,bool derive,bool instance,bool closure,bool merge, CGuiObject *ref,CPoint pt)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::DoPasteItem");
***************
*** 2486,2489 ****
--- 2493,2498 ----
  	if(closure)
  		CGMEEventLogger::LogGMEEvent(" CLOSURE");
+ 	if(merge)
+ 		CGMEEventLogger::LogGMEEvent(" SMART");
  	CGMEEventLogger::LogGMEEvent(" in "+path+name+"\r\n");
  	if(ref)
***************
*** 2504,2508 ****
  		{
  			if( closure && theApp.mgaConstMgr) theApp.mgaConstMgr->Enable( false); // if closure is inserted disable the constraint manager ...
! 			ok = CGMEDataSource::ParseXMLData(pDataObject, currentModel);
  			if( closure && theApp.mgaConstMgr) theApp.mgaConstMgr->Enable( true); // ... and enable it after done
  		}
--- 2513,2517 ----
  		{
  			if( closure && theApp.mgaConstMgr) theApp.mgaConstMgr->Enable( false); // if closure is inserted disable the constraint manager ...
! 			ok = CGMEDataSource::ParseXMLData(pDataObject, currentModel, merge);
  			if( closure && theApp.mgaConstMgr) theApp.mgaConstMgr->Enable( true); // ... and enable it after done
  		}
***************
*** 4250,4253 ****
--- 4259,4263 ----
  					instanceDrop,
  					false,
+ 					false,
  					((guiRef || compRef) && !sameTarget) ? target : 0,
  					point);
***************
*** 4924,4928 ****
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,true,false,false,false,false,false,0,contextMenuLocation);
  	}
  }
--- 4934,4938 ----
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,true,false,false,false,false,false,false,0,contextMenuLocation);
  	}
  }
***************
*** 5800,5809 ****
  void CGMEView::OnEditPastespecialAsclosure()
  {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditPastespecialAssubtype in "+path+name+"\r\n");
  	if(isType) {
  		COleDataObject clipboardData;
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,false,false,false,false,false,true);
  	}
  }
--- 5810,5841 ----
  void CGMEView::OnEditPastespecialAsclosure()
  {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditPastespecialAsclosure in "+path+name+"\r\n");
  	if(isType) {
  		COleDataObject clipboardData;
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,false,false,false,false,false,true, false);
! 	}
! }
! 
! void CGMEView::OnEditPastespecialAdditive()
! {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditPastespecialAdditive in "+path+name+"\r\n");
! 	if(isType) {
! 		COleDataObject clipboardData;
! 		clipboardData.AttachClipboard();
! 		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,false,false,false,false,false,true, false);
! 	}
! }
! 
! void CGMEView::OnEditPastespecialMerge()
! {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::OnEditPastespecialMerge in "+path+name+"\r\n");
! 	if(isType) {
! 		COleDataObject clipboardData;
! 		clipboardData.AttachClipboard();
! 		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,false,false,false,false,false,true, true);
  	}
  }
***************
*** 5829,5832 ****
--- 5861,5874 ----
  }
  
+ void CGMEView::OnUpdateEditPastespecialAdditive(CCmdUI* pCmdUI)
+ {
+ 	OnUpdateEditPaste(pCmdUI);
+ }
+ 
+ void CGMEView::OnUpdateEditPastespecialMerge(CCmdUI* pCmdUI)
+ {
+ 	OnUpdateEditPaste(pCmdUI);
+ }
+ 
  void CGMEView::OnCntxPastespecialAsinstance()
  {
***************
*** 5836,5840 ****
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = true;
! 		DoPasteItem(&clipboardData,true,false,false,true,true,false,0,contextMenuLocation);
  	}
  }
--- 5878,5882 ----
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = true;
! 		DoPasteItem(&clipboardData,true,false,false,true,true,false,false,0,contextMenuLocation);
  	}
  }
***************
*** 5852,5856 ****
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,true,false,true,false,false,false,0,contextMenuLocation);
  	}
  }
--- 5894,5898 ----
  		clipboardData.AttachClipboard();
  		derivedDrop = instanceDrop = false;
! 		DoPasteItem(&clipboardData,true,false,true,false,false,false,false,0,contextMenuLocation);
  	}
  }
***************
*** 5869,5873 ****
  		derivedDrop = true;
  		instanceDrop = false;
! 		DoPasteItem(&clipboardData,true,false,false,true,false,false,0,contextMenuLocation);
  	}
  }
--- 5911,5915 ----
  		derivedDrop = true;
  		instanceDrop = false;
! 		DoPasteItem(&clipboardData,true,false,false,true,false,false,false,0,contextMenuLocation);
  	}
  }
***************
*** 5886,5890 ****
  		derivedDrop = true;
  		instanceDrop = false;
! 		DoPasteItem(&clipboardData,false,false,false,false,false,true,0,contextMenuLocation);
  	}
  }
--- 5928,5932 ----
  		derivedDrop = true;
  		instanceDrop = false;
! 		DoPasteItem(&clipboardData,false,false,false,false,false,true,false,0,contextMenuLocation);
  	}
  }
***************
*** 5895,5898 ****
--- 5937,5974 ----
  }
  
+ void CGMEView::OnCntxPastespecialAdditive()
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxPastespecialAdditive in "+path+name+"\r\n");
+ 	if(isType) {
+ 		COleDataObject clipboardData;
+ 		clipboardData.AttachClipboard();
+ 		derivedDrop = true;
+ 		instanceDrop = false;
+ 		DoPasteItem(&clipboardData,false,false,false,false,false,true,false,0,contextMenuLocation);
+ 	}
+ }
+ 
+ void CGMEView::OnUpdateCntxPastespecialAdditive(CCmdUI* pCmdUI)
+ {
+ 	OnUpdateEditPaste(pCmdUI);
+ }
+ 
+ void CGMEView::OnCntxPastespecialMerge()
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxPastespecialMerge in "+path+name+"\r\n");
+ 	if(isType) {
+ 		COleDataObject clipboardData;
+ 		clipboardData.AttachClipboard();
+ 		derivedDrop = true;
+ 		instanceDrop = false;
+ 		DoPasteItem(&clipboardData,false,false,false,false,false,true,true,0,contextMenuLocation);
+ 	}
+ }
+ 
+ void CGMEView::OnUpdateCntxPastespecialMerge(CCmdUI* pCmdUI)
+ {
+ 	OnUpdateEditPaste(pCmdUI);
+ }
+ 
  void CGMEView::OnCntxRedirectionpaste()
  {
***************
*** 5906,5910 ****
  			clipboardData.AttachClipboard();
  			derivedDrop = instanceDrop = false;
! 			DoPasteItem(&clipboardData,true,false,true,false,false,false,ref,contextMenuLocation);
  		}
  	}
--- 5982,5986 ----
  			clipboardData.AttachClipboard();
  			derivedDrop = instanceDrop = false;
! 			DoPasteItem(&clipboardData,true,false,true,false,false,false,false,ref,contextMenuLocation);
  		}
  	}

Index: GMEView.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** GMEView.h	17 Jun 2005 03:36:01 -0000	1.68
--- GMEView.h	19 Jul 2005 17:47:01 -0000	1.69
***************
*** 200,204 ****
  	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);
--- 200,204 ----
  	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,bool merge = 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);
***************
*** 375,382 ****
--- 375,386 ----
  	afx_msg void OnEditPastespecialAssubtype();
  	afx_msg void OnEditPastespecialAsclosure();
+ 	afx_msg void OnEditPastespecialAdditive();
+ 	afx_msg void OnEditPastespecialMerge();
  	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 OnUpdateEditPastespecialAdditive(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateEditPastespecialMerge(CCmdUI* pCmdUI);
  	afx_msg void OnCntxPastespecialAsinstance();
  	afx_msg void OnUpdateCntxPastespecialAsinstance(CCmdUI* pCmdUI);
***************
*** 387,390 ****
--- 391,398 ----
  	afx_msg void OnCntxPastespecialAsclosure();
  	afx_msg void OnUpdateCntxPastespecialAsclosure(CCmdUI* pCmdUI);
+ 	afx_msg void OnCntxPastespecialAdditive();
+ 	afx_msg void OnUpdateCntxPastespecialAdditive(CCmdUI* pCmdUI);
+ 	afx_msg void OnCntxPastespecialMerge();
+ 	afx_msg void OnUpdateCntxPastespecialMerge(CCmdUI* pCmdUI);
  	afx_msg void OnCntxRedirectionpaste();
  	afx_msg void OnUpdateCntxRedirectionpaste(CCmdUI* pCmdUI);

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** GME.rc	17 Jun 2005 03:36:01 -0000	1.140
--- GME.rc	19 Jul 2005 17:47:01 -0000	1.141
***************
*** 69,74 ****
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
- IDR_MAINFRAME           ICON                    "res\\GME.ico"
  IDR_GMETYPE             ICON                    "res\\GMEDoc.ico"
  IDI_TYPEMARK_ICON       ICON                    "res\\icon1.ico"
  IDI_INSTANCEMARK_ICON   ICON                    "res\\typemark.ico"
--- 69,74 ----
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
  IDR_GMETYPE             ICON                    "res\\GMEDoc.ico"
+ IDR_MAINFRAME           ICON                    "res\\GME.ico"
  IDI_TYPEMARK_ICON       ICON                    "res\\icon1.ico"
  IDI_INSTANCEMARK_ICON   ICON                    "res\\typemark.ico"
***************
*** 267,272 ****
              MENUITEM "As Instance",                 ID_EDIT_PASTESPECIAL_ASINSTANCE
  
!             MENUITEM "Closure/Smart",               ID_EDIT_PASTESPECIAL_ASCLOSURE
  
          END
          MENUITEM "&Delete",                     ID_EDIT_DELETE
--- 267,279 ----
              MENUITEM "As Instance",                 ID_EDIT_PASTESPECIAL_ASINSTANCE
  
!             MENUITEM "Closure",                     ID_EDIT_PASTESPECIAL_ASCLOSURE
  
+             POPUP "Smart"
+             BEGIN
+                 MENUITEM "Add",                         ID_EDIT_PASTESPECIAL_SMART_ADDITIVE
+ 
+                 MENUITEM "Merge",                       ID_EDIT_PASTESPECIAL_SMART_MERGE
+ 
+             END
          END
          MENUITEM "&Delete",                     ID_EDIT_DELETE
***************
*** 382,387 ****
              MENUITEM "As Instance",                 ID_CNTX_PASTESPECIAL_ASINSTANCE
  
!             MENUITEM "Closure/Smart",               ID_CNTX_PASTESPECIAL_ASCLOSURE
  
          END
          MENUITEM "Delete",                      ID_SELFCNTX_DELETE
--- 389,401 ----
              MENUITEM "As Instance",                 ID_CNTX_PASTESPECIAL_ASINSTANCE
  
!             MENUITEM "Closure",                     ID_CNTX_PASTESPECIAL_ASCLOSURE
  
+             POPUP "Smart"
+             BEGIN
+                 MENUITEM "Add",                         ID_CNTX_PASTESPECIAL_SMART_ADDITIVE
+ 
+                 MENUITEM "Merge",                       ID_CNTX_PASTESPECIAL_SMART_MERGE
+ 
+             END
          END
          MENUITEM "Delete",                      ID_SELFCNTX_DELETE
***************
*** 583,587 ****
  FONT 10, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     CTEXT           GME_VERSION_STR,IDC_STATIC,11,65,152,8,SS_NOPREFIX
      CTEXT           "Copyright © 2000-2005 Vanderbilt University",IDC_STATIC,
                      10,75,152,8
--- 597,601 ----
  FONT 10, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     CTEXT           "5.6.22",IDC_STATIC,11,65,152,8,SS_NOPREFIX
      CTEXT           "Copyright © 2000-2005 Vanderbilt University",IDC_STATIC,
                      10,75,152,8
***************
*** 1253,1256 ****
--- 1267,1274 ----
  BEGIN
      IDR_MAINFRAME           "GME"
+ END
+ 
+ STRINGTABLE 
+ BEGIN
      IDR_GMETYPE             "\nGME\nGME\n\n\nGME.Project\nGME Project"
  END

Index: GMEOLEData.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GMEOLEData.cpp	26 Jan 2005 17:28:27 -0000	1.22
--- GMEOLEData.cpp	19 Jul 2005 17:47:01 -0000	1.23
***************
*** 207,211 ****
  }
  
! bool CGMEDataSource::ParseXMLData(COleDataObject *pDataObject, IMgaObject *target)
  {
  	ASSERT( pDataObject != NULL );
--- 207,211 ----
  }
  
! bool CGMEDataSource::ParseXMLData(COleDataObject *pDataObject, IMgaObject *target, bool merge = false)
  {
  	ASSERT( pDataObject != NULL );
***************
*** 278,282 ****
  			msg.Append("Inserting XML SmartCopied data...");
  			if( t_GME) COMTHROW( t_GME->ConsoleMessage( msg, MSG_INFO));
! 			COMTHROW( parser->ParseClos4( target, PutInBstr(filename)) );
  			if( t_GME) COMTHROW( t_GME->ConsoleMessage( done, MSG_INFO));
  		}
--- 278,282 ----
  			msg.Append("Inserting XML SmartCopied data...");
  			if( t_GME) COMTHROW( t_GME->ConsoleMessage( msg, MSG_INFO));
! 			COMTHROW( parser->ParseClos4( target, PutInBstr(filename), merge?MERGE:ADDITION ));
  			if( t_GME) COMTHROW( t_GME->ConsoleMessage( done, MSG_INFO));
  		}

Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** resource.h	17 Jun 2005 03:36:01 -0000	1.65
--- resource.h	19 Jul 2005 17:47:01 -0000	1.66
***************
*** 19,25 ****
  #define IDB_SPLASH                      112
  #define ID_PROPERTYCOMBO                113
- #define IDR_MAINFRAME                   128
  #define IDR_GMETYPE                     130
- #define IDR_TOOLBAR_MODE                131
  #define IDB_TYPEMARK_BITMAP             132
  #define IDB_INSTANCEMARK_BITMAP         133
--- 19,23 ----
***************
*** 172,175 ****
--- 170,175 ----
  #define IDD_PRINTSETUP_DIALOG           1539
  #define IDD_PARADIGMPROPERTIES_DIALOG   1540
+ #define IDR_MAINFRAME                   5555
+ #define IDR_TOOLBAR_MODE                5556
  #define ID_CANCEL_EDIT_CNTR             32768
  #define ID_MODE_EDIT                    32769
***************
*** 345,348 ****
--- 345,352 ----
  #define ID_CNTX_NMPOS_WEST              32982
  #define ID_CNTX_NMPOS_EAST              32984
+ #define ID_CNTX_PASTESPECIAL_SMART_MERGE      32985
+ #define ID_CNTX_PASTESPECIAL_SMART_ADDITIVE   32986
+ #define ID_EDIT_PASTESPECIAL_SMART_MERGE 32987
+ #define ID_EDIT_PASTESPECIAL_SMART_ADDITIVE 32988
  #define IDC_BTNSELECT                   33000
  #define IDC_BTNDESELECT                 33001
***************
*** 363,368 ****
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_3D_CONTROLS                     1
! #define _APS_NEXT_RESOURCE_VALUE        211
! #define _APS_NEXT_COMMAND_VALUE         32985
  #define _APS_NEXT_CONTROL_VALUE         1109
  #define _APS_NEXT_SYMED_VALUE           115
--- 367,372 ----
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_3D_CONTROLS                     1
! #define _APS_NEXT_RESOURCE_VALUE        212
! #define _APS_NEXT_COMMAND_VALUE         32989
  #define _APS_NEXT_CONTROL_VALUE         1109
  #define _APS_NEXT_SYMED_VALUE           115

Index: GMEDoc.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** GMEDoc.cpp	8 Jul 2005 21:37:54 -0000	1.28
--- GMEDoc.cpp	19 Jul 2005 17:47:01 -0000	1.29
***************
*** 356,366 ****
  	CComBstrObj path; 
  
  	// if container selected then it must be lonely (no multiple selection)
  	// if container selected no other kinds allowed
! 	if( any_container && !all_containers || number_of_elems > 1 && all_containers)
! 	{
! 		AfxMessageBox("Invalid selection for smart copy. You can select either one container or several non-containers.", MB_ICONERROR);
! 		return;
! 	}
  
  	if( any_container) k |= 1024;
--- 356,367 ----
  	CComBstrObj path; 
  
+ 	// commented out when new smart copy introduced
  	// if container selected then it must be lonely (no multiple selection)
  	// if container selected no other kinds allowed
! 	//if( any_container && !all_containers || number_of_elems > 1 && all_containers)
! 	//{
! 	//	AfxMessageBox("Invalid selection for smart copy. You can select either one container or several non-containers.", MB_ICONERROR);
! 	//	return;
! 	//}
  
  	if( any_container) k |= 1024;

More information about the GME-commit mailing list