[Silgraphite-cvs] silgraphite/include GrEngine.h,1.4,1.5 GrSegment.h,1.3,1.4

[<sil...@li...>]

Update of /cvsroot/silgraphite/silgraphite/include
In directory sc8-pr-cvs1:/tmp/cvs-serv1801/include

Modified Files:
	GrEngine.h GrSegment.h 
Log Message:
Synchronized with FW, 30 Jan 2003, changelist #06024


Index: GrEngine.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrEngine.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GrEngine.h	2 Jan 2003 21:18:42 -0000	1.4
+++ GrEngine.h	30 Jan 2003 20:17:28 -0000	1.5
@@ -354,7 +354,7 @@
 		bool * pfNextIsSameWs, int * pnDirDepth);
 
 #ifdef GR_FW
-	GrResult InitFromControlFile(IGrGraphics * pgg, StrAnsi staFontFile,
+	GrResult InitFromControlFile(IGrGraphics * pgg, StrApp strFontFile,
 		bool fBold, bool fItalic);
 	GrResult ReadFromControlFile(StrUni stuFontFile);
 //	GrResult GetFallBackFont(StrUni * pstu);

Index: GrSegment.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrSegment.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GrSegment.h	2 Jan 2003 21:18:43 -0000	1.3
+++ GrSegment.h	30 Jan 2003 20:17:28 -0000	1.4
@@ -131,7 +131,7 @@
 		bool fSkipSpace,
 		int crgMax,	// number of ranges allowed
 		int * pcxd,	// number actually made
-		int * prgxdLefts, int * prgxdRights, int * prgydTops);
+		int * prgxdLefts, int * prgxdRights, int * prgydUnderline);
 	GrResult GetInitialization(int cbDat, byte * prgbDat, int * pcbDatRet);
 
 	// Not part of FW interface: