[GME-commit] GMESRC/GME/Gme GUIObject.cpp,1.55,1.56

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Oct 18 00:14:59 CDT 2006


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

Modified Files:
	GUIObject.cpp 
Log Message:
Empty collection test needed.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GUIObject.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GUIObject.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** GUIObject.cpp	17 Oct 2006 23:04:22 -0000	1.55
--- GUIObject.cpp	17 Oct 2006 23:14:57 -0000	1.56
***************
*** 1519,1523 ****
  	GMEEVENTLOG_GUIOBJS(objList);
  
! 	CGuiObject *first_obj = objList.GetHead();
  	if( first_obj && first_obj->GetView() && first_obj->GetView() != modelGrid.GetSource())
  	{
--- 1519,1523 ----
  	GMEEVENTLOG_GUIOBJS(objList);
  
! 	CGuiObject *first_obj = objList.IsEmpty() ? 0 : objList.GetHead();
  	if( first_obj && first_obj->GetView() && first_obj->GetView() != modelGrid.GetSource())
  	{
***************
*** 1532,1535 ****
--- 1532,1536 ----
  		first_obj->GetView()->FillModelGrid();
  	}
+ 
  	POSITION pos = objList.GetHeadPosition();
  	while(pos) {
***************
*** 1557,1561 ****
  	ASSERT(right == 0 || down == 0); // cannot nudge diagonally for now
  
! 	CGuiObject *first_obj = modelList.GetHead();
  	if( first_obj && first_obj->GetView() && first_obj->GetView() != modelGrid.GetSource())
  	{
--- 1558,1562 ----
  	ASSERT(right == 0 || down == 0); // cannot nudge diagonally for now
  
! 	CGuiObject *first_obj = modelList.IsEmpty() ? 0 : modelList.GetHead();
  	if( first_obj && first_obj->GetView() && first_obj->GetView() != modelGrid.GetSource())
  	{



More information about the GME-commit mailing list