diff options
| author | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
| commit | 39bde23dd9b156b05aad549ca1d9c0e5026378fe (patch) | |
| tree | cd09969caf68e02571faecc53a3b8ba8e047f716 /demos/modules | |
| parent | 835f0f197f7fc7eecf5dcd36892987c71caa5caa (diff) | |
| parent | ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc (diff) | |
| download | uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.gz uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.bz2 uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.zip | |
Merge branch 'develop'
Diffstat (limited to 'demos/modules')
| -rw-r--r-- | demos/modules/gdisp/images/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gdisp/images_animated/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gdisp/images_palettes/main.c | 2 | ||||
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/modules/gdisp/images/main.c b/demos/modules/gdisp/images/main.c index a394bd2e..cdedc52d 100644 --- a/demos/modules/gdisp/images/main.c +++ b/demos/modules/gdisp/images/main.c @@ -36,7 +36,7 @@ * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS. */ -static gdispImage myImage; +static gImage myImage; int main(void) { gCoord swidth, sheight; diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c index 0503bcd3..b20c7174 100644 --- a/demos/modules/gdisp/images_animated/main.c +++ b/demos/modules/gdisp/images_animated/main.c @@ -39,7 +39,7 @@ #define USE_IMAGE_CACHE GFXOFF // Only if you want to get performance at the expense of RAM #define MY_BG_COLOR RGB2COLOR(220, 220, 255) // Pale blue so we can see the transparent parts -static gdispImage myImage; +static gImage myImage; #define SHOW_ERROR(color) gdispFillArea(errx, erry, errcx, errcy, color) diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c index b9327e52..5ea78107 100644 --- a/demos/modules/gdisp/images_palettes/main.c +++ b/demos/modules/gdisp/images_palettes/main.c @@ -40,7 +40,7 @@ #include "gfx.h" -static gdispImage _imgHome; +static gImage _imgHome; int main(void) { diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 52ffdc91..a4473596 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -97,7 +97,7 @@ static GHandle ghRadioBlack, ghRadioWhite, ghRadioYellow; static GHandle ghList1, ghList2, ghList3, ghList4; static GHandle ghImage1; static GHandle ghProgressbar1; -static gdispImage imgYesNo; +static gImage imgYesNo; /* Some useful macros */ #define ScrWidth gdispGetWidth() |