[Igarden-commit] CommonSource/YAAFExtensions RGDateCell.cpp, 1.2.2.15, 1.2.2.16 RGTableCell.cpp, 1.46.2.24, 1.46.2.25 RGTableCell.h, 1.23.2.12, 1.23.2.13

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

Update of /cvsroot/igarden/CommonSource/YAAFExtensions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24269/YAAFExtensions

Modified Files:
      Tag: Release_branch_v1
	RGDateCell.cpp RGTableCell.cpp RGTableCell.h 
Log Message:
Fix problem changing fonts on cells using italics

Index: RGDateCell.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDateCell.cpp,v
retrieving revision 1.2.2.15
retrieving revision 1.2.2.16
diff -C2 -d -r1.2.2.15 -r1.2.2.16
*** RGDateCell.cpp	30 Mar 2008 21:54:32 -0000	1.2.2.15
--- RGDateCell.cpp	17 May 2008 16:59:18 -0000	1.2.2.16
***************
*** 169,173 ****
  		MarkReadOnly(draw, back, backColor);
  
! 	draw.SetFontObject(_font);
  	draw.MoveTo(back.left+3,back.top + draw.GetFontAscent());
  	
--- 169,173 ----
  		MarkReadOnly(draw, back, backColor);
  
! 	draw.SetFontObject(GetFont());
  	draw.MoveTo(back.left+3,back.top + draw.GetFontAscent());
  	

Index: RGTableCell.h
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.h,v
retrieving revision 1.23.2.12
retrieving revision 1.23.2.13
diff -C2 -d -r1.23.2.12 -r1.23.2.13
*** RGTableCell.h	12 Apr 2008 22:42:08 -0000	1.23.2.12
--- RGTableCell.h	17 May 2008 16:59:18 -0000	1.23.2.13
***************
*** 205,209 ****
  		long					MyColumnWidth();
  		bool					IsDrawnAsSelected();
! 	
  		//!!! Split this up into many classes
  		// Text Data
--- 205,210 ----
  		long					MyColumnWidth();
  		bool					IsDrawnAsSelected();
! 	XGFont					*GetFont();
! 
  		//!!! Split this up into many classes
  		// Text Data
***************
*** 229,233 ****
  		short				_type;
  		Color				_textColor;
! 		XGFont				*_font;
  		bool				_readOnly;
  		bool				_tempReadOnly;
--- 230,234 ----
  		short				_type;
  		Color				_textColor;
! 		XGFont				*_specialFont;
  		bool				_readOnly;
  		bool				_tempReadOnly;

Index: RGTableCell.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v
retrieving revision 1.46.2.24
retrieving revision 1.46.2.25
diff -C2 -d -r1.46.2.24 -r1.46.2.25
*** RGTableCell.cpp	14 May 2008 13:06:32 -0000	1.46.2.24
--- RGTableCell.cpp	17 May 2008 16:59:18 -0000	1.46.2.25
***************
*** 88,92 ****
  	_iconSize.h = 0;
  	_iconSize.v = 0;
! 	_font = XGFont::LoadFont(1);
  
  	_altIconID = 0;
--- 88,92 ----
  	_iconSize.h = 0;
  	_iconSize.v = 0;
! 	_specialFont = NULL;
  
  	_altIconID = 0;
***************
*** 119,123 ****
  	_iconSize.h = 0;
  	_iconSize.v = 0;
! 	_font = _parent->GetFont();
  
  	_altIconID = 0;
--- 119,123 ----
  	_iconSize.h = 0;
  	_iconSize.v = 0;
! 	_specialFont = NULL;
  
  	_altIconID = 0;
***************
*** 220,224 ****
  void RGTableCell::SetFontStyle(short flags)
  {
! 	_font = XGFont::GetFontVariant(_font, flags);
  }
  
--- 220,226 ----
  void RGTableCell::SetFontStyle(short flags)
  {
! 	if(_specialFont != NULL)
! 		_specialFont->Release();
! 	_specialFont = XGFont::GetFontVariant(_parent->GetFont(), flags);
  }
  
***************
*** 443,447 ****
  			if (GetColumn() < _parent->GetNumColumns()-1) r.right--;
  				
! 				draw.SetFontObject(_font);
  				h = SizeWrappedText(draw,r,buffer) + 4;
  			break;
--- 445,449 ----
  			if (GetColumn() < _parent->GetNumColumns()-1) r.right--;
  				
! 				draw.SetFontObject(GetFont());
  				h = SizeWrappedText(draw,r,buffer) + 4;
  			break;
***************
*** 536,540 ****
  			}
  			draw.SetForeColor(_textColor);
! 			draw.SetFontObject(_font);
  			
  			draw.MoveTo(back.left+3,back.top + draw.GetFontAscent());
--- 538,542 ----
  			}
  			draw.SetForeColor(_textColor);
! 			draw.SetFontObject(GetFont());
  			
  			draw.MoveTo(back.left+3,back.top + draw.GetFontAscent());
***************
*** 1646,1650 ****
  short RGTableCell::WidthOfString(const char *str, XGDraw& draw)
  {
! 	draw.SetFontObject(_font);
  	return draw.StringWidth(str, strlen(str));
  }
--- 1648,1652 ----
  short RGTableCell::WidthOfString(const char *str, XGDraw& draw)
  {
! 	draw.SetFontObject(GetFont());
  	return draw.StringWidth(str, strlen(str));
  }
***************
*** 1698,1701 ****
--- 1700,1718 ----
  }
  
+ //*******************************************
+ ///	GetFont
+ //
+ /// Use the parent tables font in non-special cases, in order to not have to update the font
+ // of every cell.
+ //
+ XGFont *RGTableCell::GetFont()
+ {
+ 	if(_specialFont != NULL)
+ 		return _specialFont;
+ 	else
+ 		return _parent->GetFont();
+ }
+ 
+ 
  #pragma mark *** AddRemoveDialog ***