aboutsummaryrefslogtreecommitdiffstats
path: root/demos/tools
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-07-08 13:05:27 +1000
committerinmarket <andrewh@inmarket.com.au>2018-07-08 13:05:27 +1000
commitcbf1d4dfa095bc1fae927228ad108b6086738f01 (patch)
tree158ad908c0cd4d2f96218dfbbf8eb647c2609b91 /demos/tools
parenta24fab0d7217aaae1463f62d5d1381ef820cfa17 (diff)
downloaduGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.tar.gz
uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.tar.bz2
uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.zip
Added type gFont to replace V2.x font_t
Diffstat (limited to 'demos/tools')
-rw-r--r--demos/tools/touch_calibration_grabber/main.c2
-rw-r--r--demos/tools/touch_driver_test/main.c2
-rw-r--r--demos/tools/touch_raw_readings/main.c2
-rw-r--r--demos/tools/uGFXnetDisplay/main.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/tools/touch_calibration_grabber/main.c b/demos/tools/touch_calibration_grabber/main.c
index 81032b83..1aa5a9f8 100644
--- a/demos/tools/touch_calibration_grabber/main.c
+++ b/demos/tools/touch_calibration_grabber/main.c
@@ -33,7 +33,7 @@
#include "src/ginput/ginput_driver_mouse.h"
static GConsoleObject gc;
-static font_t font;
+static gFont font;
static gCoord bHeight;
static GHandle ghc;
static gCoord swidth, sheight;
diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c
index 3915c2a8..c338e24c 100644
--- a/demos/tools/touch_driver_test/main.c
+++ b/demos/tools/touch_driver_test/main.c
@@ -37,7 +37,7 @@
static GConsoleObject gc;
static GListener gl;
-static font_t font;
+static gFont font;
static gCoord bWidth, bWidth2, bHeight;
static GHandle ghc;
static gCoord swidth, sheight;
diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c
index 9077b1ac..9b3c125c 100644
--- a/demos/tools/touch_raw_readings/main.c
+++ b/demos/tools/touch_raw_readings/main.c
@@ -37,7 +37,7 @@
static GConsoleObject gc;
static GListener gl;
-static font_t font;
+static gFont font;
static gCoord bHeight;
static GHandle ghc;
static gCoord swidth, sheight;
diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
index 18e6d2ef..de814dde 100644
--- a/demos/tools/uGFXnetDisplay/main.c
+++ b/demos/tools/uGFXnetDisplay/main.c
@@ -111,7 +111,7 @@
static GListener gl;
#endif
static SOCKET_TYPE netfd = (SOCKET_TYPE)-1;
-static font_t font;
+static gFont font;
#define STRINGOF_RAW(s) #s
#define STRINGOF(s) STRINGOF_RAW(s)