Added type gFontmetric to replace V2.x fontmetric_t, and values gFontXXX replace fontXXX

5 files changed, 6 insertions, 6 deletions

diff --git a/demos/games/tetris/tetris.c b/demos/games/tetris/tetris.c
index 5beae2e9..e24c5122 100644
--- a/demos/games/tetris/tetris.c
+++ b/demos/games/tetris/tetris.c
@@ -262,7 +262,7 @@ static void printGameOver(void) {
 }
 
 static void printTouchAreas(void) {
-  gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetFontMetric(font16, fontHeight), "Touch Area's", font16, GFX_WHITE, gJustifyCenter);
+  gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetFontMetric(font16, gFontHeight), "Touch Area's", font16, GFX_WHITE, gJustifyCenter);
   gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight()/4, "Pause", font16, GFX_GRAY, gJustifyCenter);
   gdispDrawStringBox(0, gdispGetHeight()/4, gdispGetWidth(), gdispGetHeight()/2, "Rotate", font16, GFX_GRAY, gJustifyCenter);
   gdispDrawStringBox(0, gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/4, gdispGetHeight()/4, "Left", font16, GFX_GRAY, gJustifyCenter);
diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c
index 9c351de8..ce66aabd 100644
--- a/demos/modules/gdisp/fonts/main.c
+++ b/demos/modules/gdisp/fonts/main.c
@@ -53,8 +53,8 @@ int main(void) {
 	//font2 = gdispOpenFont("Apple*");
 
 	y = 0;
-	fheight1 = gdispGetFontMetric(font1, fontHeight)+2;
-	fheight2 = gdispGetFontMetric(font2, fontHeight)+2;
+	fheight1 = gdispGetFontMetric(font1, gFontHeight)+2;
+	fheight2 = gdispGetFontMetric(font2, gFontHeight)+2;
 
 	line1 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 	line2 = "0123456789~!@#$%^&*_-+=(){}[]<>|/\\:;,.?'\"`";
diff --git a/demos/tools/touch_calibration_grabber/main.c b/demos/tools/touch_calibration_grabber/main.c
index ac55f051..81032b83 100644
--- a/demos/tools/touch_calibration_grabber/main.c
+++ b/demos/tools/touch_calibration_grabber/main.c
@@ -55,7 +55,7 @@ int main(void) {
 	// Create our title
 	font = gdispOpenFont("UI2");
 	gwinSetDefaultFont(font);
-	bHeight = gdispGetFontMetric(font, fontHeight)+4;
+	bHeight = gdispGetFontMetric(font, gFontHeight)+4;
 	gdispFillStringBox(0, 0, swidth, bHeight, "Touchscreen Calibration Grabber", font, GFX_RED, GFX_WHITE, gJustifyCenter);
 
 	// Create our main display writing window
diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c
index 08d6da3b..3915c2a8 100644
--- a/demos/tools/touch_driver_test/main.c
+++ b/demos/tools/touch_driver_test/main.c
@@ -115,7 +115,7 @@ int main(void) {
 	bHeight = gdispGetStringWidth("-", font)*2;
 	if (bHeight > bWidth2) bWidth2 = bHeight;
 	bWidth2 += 4;
-	bHeight = gdispGetFontMetric(font, fontHeight)*2+2;
+	bHeight = gdispGetFontMetric(font, gFontHeight)*2+2;
 
 	// Create our main display window
 	{
diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c
index 416b75a5..9077b1ac 100644
--- a/demos/tools/touch_raw_readings/main.c
+++ b/demos/tools/touch_raw_readings/main.c
@@ -60,7 +60,7 @@ int main(void) {
 	// Create our title
 	font = gdispOpenFont("UI2");
 	gwinSetDefaultFont(font);
-	bHeight = gdispGetFontMetric(font, fontHeight)+4;
+	bHeight = gdispGetFontMetric(font, gFontHeight)+4;
 	gdispFillStringBox(0, 0, swidth, bHeight, "Raw Touch Readings", font, GFX_RED, GFX_WHITE, gJustifyCenter);
 
 	// Create our main display writing window