[Igarden-commit] Garden/source/Document CDatabasePanel.h, 1.17.2.12, 1.17.2.13 CDatabasePanel.cpp, 1.4.2.23, 1.4.2.24

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

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

Modified Files:
      Tag: Release_branch_v1
	CDatabasePanel.h CDatabasePanel.cpp 
Log Message:
Display color text for all instance columns.

Index: CDatabasePanel.h
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.h,v
retrieving revision 1.17.2.12
retrieving revision 1.17.2.13
diff -C2 -d -r1.17.2.12 -r1.17.2.13
*** CDatabasePanel.h	19 Mar 2008 01:18:29 -0000	1.17.2.12
--- CDatabasePanel.h	8 Apr 2008 22:24:23 -0000	1.17.2.13
***************
*** 193,196 ****
--- 193,197 ----
  		static UInt32			ThisYear();
  		void					LoadFontFromPrefs();
+ 		bool					IsYearlyColumn(short column);
  	
  		DBRow_t					*RowPtr(long row);

Index: CDatabasePanel.cpp
===================================================================
RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.cpp,v
retrieving revision 1.4.2.23
retrieving revision 1.4.2.24
diff -C2 -d -r1.4.2.23 -r1.4.2.24
*** CDatabasePanel.cpp	5 Apr 2008 23:08:39 -0000	1.4.2.23
--- CDatabasePanel.cpp	8 Apr 2008 22:24:24 -0000	1.4.2.24
***************
*** 4184,4190 ****
  	result = KXGColorBlack;		// Assume until proven otherwise
  
! 	if(ColPtr(column)->type == kAttribute &&
! 	   ColPtr(column)->attrClass == kInstanceAttribute &&
! 	   _parentDoc != NULL)
  	{
  		inst = RowPtr(row)->ref->GetIndexedInstanceAttributes(subRow);
--- 4184,4188 ----
  	result = KXGColorBlack;		// Assume until proven otherwise
  
! 	if(IsYearlyColumn(column) && _parentDoc != NULL)
  	{
  		inst = RowPtr(row)->ref->GetIndexedInstanceAttributes(subRow);
***************
*** 4650,4653 ****
--- 4648,4663 ----
  }
  
+ bool CDatabasePanel::IsYearlyColumn(short column)
+ {
+ 	DBColumn_t		*cp = ColPtr(column);
+ 	if(cp->type == kAttribute && cp->attrClass == kInstanceAttribute)
+ 		return true;
+ 	else if(cp->type == kQuantity || cp->type == kItemHeight ||
+ 			cp->type == kItemSpread || cp->type == kMaterialState ||
+ 			cp->type == kInfoSupplierCol)
+ 		return true;
+ 	else
+ 		return false;
+ }
  	
  #if OPT_MACOS == 1