[GME-commit] GMESRC/GME/Gme GMEOLEData.h, 1.12, 1.13 GMEOLEData.cpp, 1.24, 1.25 GMEView.h, 1.77, 1.78 GMEView.cpp, 1.192, 1.193

Thu May 3 13:30:37 CDT 2007

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

Modified Files:
	GMEOLEData.h GMEOLEData.cpp GMEView.h GMEView.cpp 
Log Message:
1.Objectinspector cycling back and forward on key shortcuts.
2.Memory leak happened when CRectList were allocated on drag&drop or movement.
Affected GMEActiveBrowser too.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEOLEData.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEData.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** GMEOLEData.cpp	15 Feb 2006 21:02:30 -0000	1.24
--- GMEOLEData.cpp	3 May 2007 18:30:34 -0000	1.25
***************
*** 16,19 ****
--- 16,27 ----
  
  /* --------------------------- CGMEDataDescriptor --------------------------- */
+ //static // called externally, to destruct certain lists
+ void CGMEDataDescriptor::destructList( CTypedPtrList<CPtrList, CRect *>& pList)// it is a CRectList
+ {
+ 	POSITION pos = pList.GetHeadPosition();
+ 	while(pos)
+ 		delete pList.GetNext(pos);
+ 	pList.RemoveAll();
+ }
  
  CGMEDataDescriptor::CGMEDataDescriptor(CTypedPtrList<CPtrList, CRect *> &list, CTypedPtrList<CPtrList, CRect *> &annList,CPoint dragPoint,CPoint offs)

Index: GMEOLEData.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEData.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GMEOLEData.h	28 Feb 2006 19:57:05 -0000	1.12
--- GMEOLEData.h	3 May 2007 18:30:34 -0000	1.13
***************
*** 25,28 ****
--- 25,32 ----
  	void Clean();
  	int GetCount();
+ public:
+ 	// called externally (from GMEView.cpp and ActiveBrowserPropertyPage.cpp)
+ 	// to destruct certain lists
+ 	static void destructList( CTypedPtrList<CPtrList, CRect *>& pList);//it is a CRectList
  };
  

Index: GMEView.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -C2 -d -r1.192 -r1.193
*** GMEView.cpp	15 Mar 2007 22:00:14 -0000	1.192
--- GMEView.cpp	3 May 2007 18:30:34 -0000	1.193
***************
*** 426,429 ****
--- 426,431 ----
  	ON_COMMAND(ID_KEY_ZOOMIN, OnZoomIn)
  	ON_COMMAND(ID_KEY_ZOOMOUT, OnZoomOut)
+ 	ON_COMMAND(ID_KEY_CYCLEOBJINSPFRWD, OnKeyCycleObjInspectorFrwd)
+ 	ON_COMMAND(ID_KEY_CYCLEOBJINSPBKWD, OnKeyCycleObjInspectorBkwd)
  	ON_MESSAGE(WM_USER_ZOOM, OnZoom)
  	ON_MESSAGE(WM_USER_PANNREFRESH, OnPannRefresh)
***************
*** 3894,3897 ****
--- 3896,3901 ----
  					CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
  					CGMEDataDescriptor desc(rects,annRects,point,ptClickOffset);
+ 					CGMEDataDescriptor::destructList( rects);
+ 					CGMEDataDescriptor::destructList( annRects);
  
  					validGuiObjects = true;
***************
*** 5000,5003 ****
--- 5004,5009 ----
  		CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
  		CGMEDataDescriptor desc(rects,annRects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
+ 		CGMEDataDescriptor::destructList( annRects);
  		GetDocument()->CopyToClipboard(&selected,&selectedAnnotations,&desc,this);
  	}
***************
*** 5015,5018 ****
--- 5021,5026 ----
  		CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
  		CGMEDataDescriptor desc(rects,annRects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
+ 		CGMEDataDescriptor::destructList( annRects);
  		GetDocument()->CopyClosureToClipboard( &selected, &selectedAnnotations, &desc, this);
  	}
***************
*** 5030,5034 ****
  		CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
  		CGMEDataDescriptor desc(rects,annRects,pt,pt);
! 
  		CGuiFcoList fcoList;// copy selected->selectedFco
  		POSITION pos = selected.GetHeadPosition();
--- 5038,5043 ----
  		CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
  		CGMEDataDescriptor desc(rects,annRects,pt,pt);
! 		CGMEDataDescriptor::destructList( rects);
! 		CGMEDataDescriptor::destructList( annRects);
  		CGuiFcoList fcoList;// copy selected->selectedFco
  		POSITION pos = selected.GetHeadPosition();
***************
*** 5065,5068 ****
--- 5074,5079 ----
  		CGuiAnnotator::GetRectList(selectedAnnotations,annRects);
  		CGMEDataDescriptor desc(rects,annRects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
+ 		CGMEDataDescriptor::destructList( annRects);
  		GetDocument()->CopyToClipboard(&selected,&selectedAnnotations,&desc,this);
  		if(isType) DeleteObjects(selected);
***************
*** 5118,5121 ****
--- 5129,5133 ----
  			CRectList dummyAnnList;
  			CGMEDataDescriptor desc(rects,dummyAnnList,pt,pt);
+ 			CGMEDataDescriptor::destructList( rects);
  			GetDocument()->CopyToClipboard(&list,&dummyList,&desc,this);
  		}
***************
*** 5132,5135 ****
--- 5144,5148 ----
  		CRectList dummyObjList;
  		CGMEDataDescriptor desc(dummyObjList,rects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
  		GetDocument()->CopyToClipboard(&dummyList,&list,&desc,this);
  		contextAnnotation = 0;
***************
*** 5152,5155 ****
--- 5165,5169 ----
  			CRectList dummyAnnList;
  			CGMEDataDescriptor desc(rects,dummyAnnList,pt,pt);
+ 			CGMEDataDescriptor::destructList( rects);
  			GetDocument()->CopyClosureToClipboard( &list, &dummyList, &desc, this);
  		}
***************
*** 5166,5169 ****
--- 5180,5184 ----
  		CRectList dummyObjList;
  		CGMEDataDescriptor desc(dummyObjList,rects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
  		GetDocument()->CopyClosureToClipboard(&dummyList,&list,&desc,this);
  		contextAnnotation = 0;
***************
*** 5186,5189 ****
--- 5201,5205 ----
  			CRectList dummyAnnList;
  			CGMEDataDescriptor desc(rects,dummyAnnList,pt,pt);
+ 			CGMEDataDescriptor::destructList( rects);
  
  			CGuiFcoList fcoList;
***************
*** 5221,5224 ****
--- 5237,5241 ----
  		CRectList dummyObjList;
  		CGMEDataDescriptor desc(dummyObjList,rects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
  		GetDocument()->CopySmartToClipboard(&dummyList,&list,&desc,this);
  		contextAnnotation = 0;
***************
*** 5242,5245 ****
--- 5259,5263 ----
  			CRectList dummyAnnList;
  			CGMEDataDescriptor desc(rects,dummyAnnList,pt,pt);
+ 			CGMEDataDescriptor::destructList( rects);
  			GetDocument()->CopyToClipboard(&list,&dummyList,&desc,this);
  			DeleteObjects(list);
***************
*** 5257,5260 ****
--- 5275,5279 ----
  		CRectList dummyObjList;
  		CGMEDataDescriptor desc(dummyObjList,rects,pt,pt);
+ 		CGMEDataDescriptor::destructList( rects);
  		GetDocument()->CopyToClipboard(&dummyList,&list,&desc,this);
  		DeleteAnnotations(list);
***************
*** 7435,7437 ****
  		}
  	}
! }
\ No newline at end of file
--- 7454,7466 ----
  		}
  	}
! }
! 
! void CGMEView::OnKeyCycleObjInspectorFrwd()
! {
! 	CGMEObjectInspector::theInstance->CyclePanel( VARIANT_TRUE);
! }
! 
! void CGMEView::OnKeyCycleObjInspectorBkwd()
! {
! 	CGMEObjectInspector::theInstance->CyclePanel( VARIANT_FALSE);
! }

Index: GMEView.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** GMEView.h	13 Mar 2007 18:54:20 -0000	1.77
--- GMEView.h	3 May 2007 18:30:34 -0000	1.78
***************
*** 460,463 ****
--- 460,465 ----
  	afx_msg void OnHistoryForw();
  	afx_msg void OnKeyConnect();
+ 	afx_msg void OnKeyCycleObjInspectorFrwd();
+ 	afx_msg void OnKeyCycleObjInspectorBkwd();
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()