Introduce type gImage to replace v2.x gdispImage

8 files changed, 10 insertions, 10 deletions

diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c
index 1bf914a6..c89562ee 100644
--- a/demos/3rdparty/notepad-2/notepadApp.c
+++ b/demos/3rdparty/notepad-2/notepadApp.c
@@ -61,7 +61,7 @@ static GButtonObject btnClose;
 /* static GButtonObject btnYes, btnNo; // Reserved for future use */
 
 // Image object
-static gdispImage toolbarImageFilmstrip;
+static gImage toolbarImageFilmstrip;
 
 static gColor myColors[] = { GFX_BLACK, GFX_RED, GFX_GREEN, GFX_BLUE, GFX_CYAN, GFX_MAGENTA, GFX_YELLOW, GFX_WHITE };
 
diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c
index da97e5d6..42e5aa1f 100644
--- a/demos/applications/combo/main.c
+++ b/demos/applications/combo/main.c
@@ -86,7 +86,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()
diff --git a/demos/games/justget10/jg10.c b/demos/games/justget10/jg10.c
index 6e1a95ec..5ccf246c 100644
--- a/demos/games/justget10/jg10.c
+++ b/demos/games/justget10/jg10.c
@@ -24,17 +24,17 @@ typedef struct {          // Node properties
 nodeProps             jg10Field[JG10_FIELD_WIDTH][JG10_FIELD_HEIGHT];   // jg10 field array
 gBool                jg10GameOver                           = gFalse;
 const char            *jg10Graph[] = {"background.bmp", "1.bmp","2.bmp","3.bmp","4.bmp","5.bmp","6.bmp","7.bmp","8.bmp", "9.bmp", "10.bmp", "11.bmp", "12.bmp", "13.bmp", "14.bmp", "15.bmp", "16.bmp", "17.bmp", "18.bmp", "19.bmp", "20.bmp"}; // 21 elements (0-20)
-gdispImage            jg10Image[JG10_MAX_COUNT];
+gImage            jg10Image[JG10_MAX_COUNT];
 #define JG10_ANIM_IMAGES 5
 #define JG10_ANIM_DELAY 60
 const char            *jg10GraphAnim[] = {"a1.bmp","a2.bmp","a3.bmp","a4.bmp","background.bmp"}; // 5 elements (0-4)
-gdispImage            jg10ImageAnim[JG10_ANIM_IMAGES];
+gImage            jg10ImageAnim[JG10_ANIM_IMAGES];
 gU8               jg10MaxVal=4;                                     // Max value in field...
 gFont font;
 #if JG10_SHOW_SPLASH
 GTimer                jg10SplashBlink;
 gBool                jg10SplashTxtVisible = gFalse;
-gdispImage            jg10SplashImage;
+gImage            jg10SplashImage;
 #endif
 
 
diff --git a/demos/games/minesweeper/mines.c b/demos/games/minesweeper/mines.c
index 6d7cd38f..73eec368 100644
--- a/demos/games/minesweeper/mines.c
+++ b/demos/games/minesweeper/mines.c
@@ -19,7 +19,7 @@ static gI16 minesFlags;                             // Flag counter
 static gI16 minesTime;                              // Time counter
 static GTimer minesTimeCounterTimer;
 static const char* minesGraph[] = {"1.bmp","2.bmp","3.bmp","4.bmp","5.bmp","6.bmp","7.bmp","8.bmp", "closed.bmp", "empty.bmp", "explode.bmp", "flag.bmp", "mine.bmp", "wrong.bmp"}; // 14 elements (0-13)
-static gdispImage minesImage;
+static gImage minesImage;
 static gU8 minesStatusIconWidth = 0;
 static gU8 minesStatusIconHeight = 0;
 static gBool minesFirstGame = gTrue;                  // Just don't clear field for the first time, as we have black screen already... :/
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()