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/3rdparty | |
| 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/3rdparty')
| -rw-r--r-- | demos/3rdparty/notepad-2/main.c | 2 | ||||
| -rw-r--r-- | demos/3rdparty/notepad-2/notepadApp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c index ec9acd0c..c61e7d94 100644 --- a/demos/3rdparty/notepad-2/main.c +++ b/demos/3rdparty/notepad-2/main.c @@ -75,7 +75,7 @@ const char *tsCalibRead(uint16_t instance) { int main(void) { - font_t font = gdispOpenFont("UI2"); + gFont font = gdispOpenFont("UI2"); /* initialize the hardware and the OS */ gfxInit(); diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c index 7526faad..f274a23f 100644 --- a/demos/3rdparty/notepad-2/notepadApp.c +++ b/demos/3rdparty/notepad-2/notepadApp.c @@ -47,7 +47,7 @@ static GHandle gstatusConsole; // GConsole Handle to the Status Bar static GEventMouse curPtr; // Holder for current pointer location -static font_t font; +static gFont font; static gCoord swidth, sheight; // The toolbar buttons - Self-Explanatory |