[Silgraphite-cvs] silgraphite/contrib/JustTestApp JustTestApp.cpp,1.6,1.6.2.1

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

Update of /cvsroot/silgraphite/silgraphite/contrib/JustTestApp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11188/contrib/JustTestApp

Modified Files:
      Tag: v2api
	JustTestApp.cpp 
Log Message:
Synchronized with FW changelist #12044: began ITextSource rework


Index: JustTestApp.cpp
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/contrib/JustTestApp/JustTestApp.cpp,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- JustTestApp.cpp	6 Oct 2004 18:28:28 -0000	1.6
+++ JustTestApp.cpp	27 Oct 2004 14:31:58 -0000	1.6.2.1
@@ -27,7 +27,7 @@
 // keep this data between events
 // note that dc and GrGraphics should not be kept between events
 LOGFONT g_lf;
-GrCharProps g_lgchrp;
+GrCharProps g_lgchrp; // TODO: get rid of this when GrGraphics no longer needs it
 RECT g_rSrc;
 RECT g_rDst;
 
@@ -602,7 +602,8 @@
 	{ for (int i = 0; i < NUMSEGMENTS; i++)
 	{
 		g_lgchrp.dympHeight = g_vdympSizes[i];
-        g_vpgrtext[i] = new GrTextSrc(g_szString, g_lgchrp, L"", 0);
+        g_vpgrtext[i] = new GrTextSrc(g_szString, g_lgchrp.szFaceName, g_lgchrp.dympHeight/1000,
+			g_lgchrp.ttvBold != kttvOff, g_lgchrp.ttvItalic != kttvOff);
 	} }
 
 	g_rSrc.top = -TOPMARGIN;
@@ -671,7 +672,8 @@
 			delete g_vpgrtext[iseg];
 
 		g_lgchrp.dympHeight = g_vdympSizes[iseg];
-		g_vpgrtext[iseg] = new GrTextSrc(g_szString, g_lgchrp, L"", 0);
+		g_vpgrtext[iseg] = new GrTextSrc(g_szString, g_lgchrp.szFaceName, g_lgchrp.dympHeight/1000,
+			g_lgchrp.ttvBold != kttvOff, g_lgchrp.ttvItalic != kttvOff);
 	}
 	g_fEngErrMsg = true;
 }
\ No newline at end of file