[Igarden-commit] CommonSource/YAAFExtensions RGHypertext.h, 1.15, 1.16

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

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

Modified Files:
	RGHypertext.h 
Log Message:
Win32 changes

Index: RGHypertext.h
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** RGHypertext.h	18 Oct 2006 01:16:11 -0000	1.15
--- RGHypertext.h	22 Feb 2007 04:43:56 -0000	1.16
***************
*** 54,59 ****
  using yaaf::XGDraw;
  //!!!using yaaf::XGEditCore;
! using yaaf::XGSDynArray;
! using yaaf::XGDynArray;
  
  using yaaf::XGView;
--- 54,59 ----
  using yaaf::XGDraw;
  //!!!using yaaf::XGEditCore;
! //using yaaf::XGSDynArray;
! //using yaaf::XGDynArray;
  
  using yaaf::XGView;
***************
*** 67,72 ****
  class CGWorld;
  
! const long KXGHyperlinkHit = 'hypr';
! const long KXGHTDrag = 'htdg';
  
  typedef struct
--- 67,72 ----
  class CGWorld;
  
! const long KXGHyperlinkHit = CHAR4('h','y','p','r');	//'hypr';
! const long KXGHTDrag = CHAR4('h','t','d','g');		//'htdg';
  
  typedef struct
***************
*** 262,268 ****
  		double						_lineHeight;
  //		XGFont						*_FontPtr;
! 		XGSDynArray<fontInfo_t*>	_fontStack;
! 		XGSDynArray<tableInfo_t*>	_tableStack;
! 		XGSDynArray<imageInfo_t>	_images;
  		String						_String;
  		Color						_backColor;
--- 262,268 ----
  		double						_lineHeight;
  //		XGFont						*_FontPtr;
! 		yaaf::XGSDynArray<fontInfo_t*>	_fontStack;
! 		yaaf::XGSDynArray<tableInfo_t*>	_tableStack;
! 		yaaf::XGSDynArray<imageInfo_t>	_images;
  		String						_String;
  		Color						_backColor;
***************
*** 271,276 ****
  		doublePoint_t				_anchorStartPos;
  		short						_anchorStartHeight;
! 		XGDynArray<anchorRect_t>	_anchorMap;
! 		XGDynArray<horizontalLine_t> _hr;
  		bool						_inAnchor;
  		bool						_loadedImageData;
--- 271,276 ----
  		doublePoint_t				_anchorStartPos;
  		short						_anchorStartHeight;
! 		yaaf::XGDynArray<anchorRect_t>	_anchorMap;
! 		yaaf::XGDynArray<horizontalLine_t> _hr;
  		bool						_inAnchor;
  		bool						_loadedImageData;
***************
*** 288,292 ****
  		Point						_offset;
  		short						_scaleByPercent;
! 		XGDynArray<lineEntry_t>		_entries;
  		findImageFP					_findImageFP;
  };
--- 288,292 ----
  		Point						_offset;
  		short						_scaleByPercent;
! 		yaaf::XGDynArray<lineEntry_t>		_entries;
  		findImageFP					_findImageFP;
  };