[Igarden-commit] Garden/source/Document PictureCell.cpp, 1.10, 1.10.2.1

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/Garden/source/Document
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15598

Modified Files:
      Tag: Release_branch_v1
	PictureCell.cpp 
Log Message:
Fix spurious stop signs in the list view

Index: PictureCell.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/PictureCell.cpp,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** PictureCell.cpp	14 Jun 2006 11:14:31 -0000	1.10
--- PictureCell.cpp	29 Oct 2006 03:34:24 -0000	1.10.2.1
***************
*** 39,42 ****
--- 39,43 ----
  	_defaultPicture = NULL;
  	_mat = NULL;
+ 	_iconID = 0;
  }
  
***************
*** 50,53 ****
--- 51,55 ----
  	_defaultPicture = cell._defaultPicture;		// External source responsible for delete
  	_mat = cell._mat;							// External source responsible for delete
+ 	_iconID = cell._iconID;
  }
  
***************
*** 66,69 ****
--- 68,72 ----
  		_defaultPicture = src->_defaultPicture;		// External source responsible for delete
  		_mat = src->_mat;							// External source responsible for delete
+ 		_iconID = src->_iconID;
      }
  }
***************
*** 121,125 ****
  	long			test, xOffset, yOffset;
  	
! 	back = r;
  	if(isPrinter)
  		InsetRect(&back, 1, 1);
--- 124,128 ----
  	long			test, xOffset, yOffset;
  	
! 		back = r;
  	if(isPrinter)
  		InsetRect(&back, 1, 1);
***************
*** 141,145 ****
  	xOffset = back.left + (_myCol->width - _iconSize.h)/2;
  	yOffset = back.top + (_myRow->height - _iconSize.v)/2;
! 	draw.DrawIcon(_iconID, xOffset, yOffset, true);
  		
  	if (f) {
--- 144,150 ----
  	xOffset = back.left + (_myCol->width - _iconSize.h)/2;
  	yOffset = back.top + (_myRow->height - _iconSize.v)/2;
! 
! 	if(_iconID != 0)
! 		draw.DrawIcon(_iconID, xOffset, yOffset, true);
  		
  	if (f) {