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 | |
| 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')
| -rw-r--r-- | demos/modules/gadc/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gaudio/play-vs1053/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gaudio/play-wave/main.c | 2 | ||||
| -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 | ||||
| -rw-r--r-- | demos/modules/gtrans/basic/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gwin/console/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gwin/keyboard/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c index 92312e83..1a4733f9 100644 --- a/demos/modules/gadc/main.c +++ b/demos/modules/gadc/main.c @@ -137,7 +137,7 @@ int main(void) { gCoord swidth, sheight; #if defined(MY_DIAL_DEVICE) || defined(MY_TEMP_DEVICE) GHandle ghText; - font_t font; + gFont font; #endif gfxInit(); diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c index 21e28c98..4e9c4b97 100644 --- a/demos/modules/gaudio/play-vs1053/main.c +++ b/demos/modules/gaudio/play-vs1053/main.c @@ -43,7 +43,7 @@ * Application entry point. */ int main(void) { - font_t font; + gFont font; GFILE *f; char *errmsg; uint32_t toplay; diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c index 4c863fcf..9717b4fe 100644 --- a/demos/modules/gaudio/play-wave/main.c +++ b/demos/modules/gaudio/play-wave/main.c @@ -45,7 +45,7 @@ static char whdr[32]; * Application entry point. */ int main(void) { - font_t font; + gFont font; GFILE *f; char *errmsg; uint32_t toplay; 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 */ diff --git a/demos/modules/gtrans/basic/main.c b/demos/modules/gtrans/basic/main.c index 283a7211..e4a6e608 100644 --- a/demos/modules/gtrans/basic/main.c +++ b/demos/modules/gtrans/basic/main.c @@ -33,7 +33,7 @@ #define COLOR_BACKGROUND GFX_SILVER #define COLOR_TEXT GFX_BLACK -font_t font; +gFont font; // English Translation static const char* EnglishStrings[] = { diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c index 53b80fcb..9cd4af76 100644 --- a/demos/modules/gwin/console/main.c +++ b/demos/modules/gwin/console/main.c @@ -34,7 +34,7 @@ GHandle GW1, GW2, GW3; int main(void) { uint8_t i; - font_t font1, font2; + gFont font1, font2; /* initialize and clear the display */ gfxInit(); diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c index b43e72d1..cf31118f 100644 --- a/demos/modules/gwin/keyboard/main.c +++ b/demos/modules/gwin/keyboard/main.c @@ -28,7 +28,7 @@ #include "gfx.h" /* The variables we need */ -static font_t font; +static gFont font; static GListener gl; static GHandle ghConsole; static GHandle ghKeyboard; diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index fd0bee1a..4b8e1146 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -77,7 +77,7 @@ static const GWidgetStyle YellowWidgetStyle = { }; /* The variables we need */ -static font_t font; +static gFont font; static GListener gl; static GHandle ghConsole; static GTimer FlashTimer; |