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/gwin | |
| 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/gwin')
| -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 |
3 files changed, 3 insertions, 3 deletions
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; |