diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 13:05:27 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 13:05:27 +1000 |
commit | cbf1d4dfa095bc1fae927228ad108b6086738f01 (patch) | |
tree | 158ad908c0cd4d2f96218dfbbf8eb647c2609b91 /demos/modules/gdisp | |
parent | a24fab0d7217aaae1463f62d5d1381ef820cfa17 (diff) | |
download | uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.tar.gz uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.tar.bz2 uGFX-cbf1d4dfa095bc1fae927228ad108b6086738f01.zip |
Added type gFont to replace V2.x font_t
Diffstat (limited to 'demos/modules/gdisp')
-rw-r--r-- | demos/modules/gdisp/fonts/main.c | 2 | ||||
-rw-r--r-- | demos/modules/gdisp/fonts_cyrillic/main.c | 2 | ||||
-rw-r--r-- | demos/modules/gdisp/multiple_displays/main.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c index ce66aabd..5a4b02df 100644 --- a/demos/modules/gdisp/fonts/main.c +++ b/demos/modules/gdisp/fonts/main.c @@ -31,7 +31,7 @@ int main(void) { gCoord width, y; - font_t font1, font2; + gFont font1, font2; gCoord fheight1, fheight2; const char *line1, *line2; char buf[8]; diff --git a/demos/modules/gdisp/fonts_cyrillic/main.c b/demos/modules/gdisp/fonts_cyrillic/main.c index 1f6a30a9..ac1d8c71 100644 --- a/demos/modules/gdisp/fonts_cyrillic/main.c +++ b/demos/modules/gdisp/fonts_cyrillic/main.c @@ -30,7 +30,7 @@ #include "gfx.h"
int main(void) {
- font_t font1;
+ gFont font1;
// Initialize uGFX and the underlying system
gfxInit();
diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c index 5df0e479..f1379f40 100644 --- a/demos/modules/gdisp/multiple_displays/main.c +++ b/demos/modules/gdisp/multiple_displays/main.c @@ -47,7 +47,7 @@ int main(void) { gCoord width, height; gCoord display, i, j, cnt; - font_t f; + gFont f; GDisplay *g; char buf[16]; @@ -91,7 +91,7 @@ int main(void) { gCoord width, height; gCoord display, i, j, cnt; - font_t f; + gFont f; char buf[16]; /* Initialize and clear the display */ |