Update demo's with images in them

6 files changed, 15 insertions, 8 deletions

diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h
index 6cd78b37..09dbe30c 100644
--- a/demos/modules/gdisp/images/gfxconf.h
+++ b/demos/modules/gdisp/images/gfxconf.h
@@ -51,5 +51,8 @@
 #define GDISP_NEED_IMAGE_JPG		FALSE
 #define GDISP_NEED_IMAGE_PNG		FALSE
 
+#define GFX_USE_GFILE				TRUE
+#define GFILE_NEED_MEMFS			TRUE
+
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images/main.c b/demos/modules/gdisp/images/main.c
index b87f663c..021bf9f5 100644
--- a/demos/modules/gdisp/images/main.c
+++ b/demos/modules/gdisp/images/main.c
@@ -53,12 +53,11 @@ int main(void) {
 
 	// Set up IO for our image
 #if USE_MEMORY_FILE
-	gdispImageSetMemoryReader(&myImage, test_pal8);
+	gdispImageOpenMemory(&myImage, test_pal8);
 #else
-	gdispImageSetSimulFileReader(&myImage, "test-pal8.bmp");
+	gdispImageOpenFile(&myImage, "test-pal8.bmp");
 #endif
 
-	gdispImageOpen(&myImage);
 	gdispImageDraw(&myImage, 0, 0, swidth, sheight, 0, 0);
 	gdispImageClose(&myImage);
 
diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h
index cc38ed36..b2dcaf92 100644
--- a/demos/modules/gdisp/images_animated/gfxconf.h
+++ b/demos/modules/gdisp/images_animated/gfxconf.h
@@ -51,5 +51,8 @@
 #define GDISP_NEED_IMAGE_JPG		FALSE
 #define GDISP_NEED_IMAGE_PNG		FALSE
 
+#define GFX_USE_GFILE				TRUE
+#define GFILE_NEED_MEMFS			TRUE
+
 #endif /* _GFXCONF_H */
 
diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c
index 9b2b5d2c..bf49f692 100644
--- a/demos/modules/gdisp/images_animated/main.c
+++ b/demos/modules/gdisp/images_animated/main.c
@@ -76,12 +76,11 @@ int main(void) {
 
 	// Set up IO for our image
 #if USE_MEMORY_FILE
-	gdispImageSetMemoryReader(&myImage, testanim);
+	if (!(gdispImageOpenMemory(&myImage, testanim) & GDISP_IMAGE_ERR_UNRECOVERABLE)) {
 #else
-	gdispImageSetFileReader(&myImage, "testanim.gif");
+	if (!(gdispImageOpenFile(&myImage, "testanim.gif") & GDISP_IMAGE_ERR_UNRECOVERABLE)) {
 #endif
 
-	if (gdispImageOpen(&myImage) == GDISP_IMAGE_ERR_OK) {
 		gdispImageSetBgColor(&myImage, MY_BG_COLOR);
 		// Adjust the error indicator area if necessary
 		if (myImage.width > errx && myImage.height < sheight) {
diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h
index b22af659..b536de4c 100644
--- a/demos/modules/gwin/widgets/gfxconf.h
+++ b/demos/modules/gwin/widgets/gfxconf.h
@@ -79,6 +79,10 @@
 #define GWIN_NEED_RADIO			TRUE
 #define GWIN_NEED_LIST			TRUE
 
+/* Features for the GFILE subsystem. */
+#define GFX_USE_GFILE				TRUE
+#define GFILE_NEED_MEMFS			TRUE
+
 /* Features for the GINPUT subsystem. */
 #define GINPUT_NEED_MOUSE		TRUE
 
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index af2926d7..80c39dd9 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -184,8 +184,7 @@ static void createWidgets(void) {
 	wi.g.x = 0+2*(LIST_WIDTH+1); wi.text = "L3"; ghList3 = gwinListCreate(0, &wi, TRUE);
 	gwinListAddItem(ghList3, "Item 0", FALSE);	gwinListAddItem(ghList3, "Item 1", FALSE);
 	gwinListAddItem(ghList3, "Item 2", FALSE);	gwinListAddItem(ghList3, "Item 3", FALSE);
-	gdispImageSetMemoryReader(&imgYesNo, image_yesno);
-	gdispImageOpen(&imgYesNo);
+	gdispImageOpenMemory(&imgYesNo, image_yesno);
 	gwinListItemSetImage(ghList3, 1, &imgYesNo);
 	gwinListItemSetImage(ghList3, 3, &imgYesNo);