diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:19:43 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:19:43 +1000 |
commit | f9c848e9851713d7a33962b9b4768c0a0d1751f1 (patch) | |
tree | 2b2caf1949078428ca3fd3cd47547d0485efa407 /src/gwin/gwin.h | |
parent | cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b (diff) | |
download | uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.gz uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.bz2 uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.zip |
Change color_t to gColor
Diffstat (limited to 'src/gwin/gwin.h')
-rw-r--r-- | src/gwin/gwin.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index 2ab50fd9..67bc2e42 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -48,8 +48,8 @@ typedef struct GWindowObject { gCoord y; /**< The position relative to the screen */ gCoord width; /**< The width of this window */ gCoord height; /**< The height of this window */ - color_t color; /**< The current foreground drawing color */ - color_t bgcolor; /**< The current background drawing color */ + gColor color; /**< The current foreground drawing color */ + gColor bgcolor; /**< The current background drawing color */ uint32_t flags; /**< Window flags (the meaning is private to the GWIN class) */ #if GDISP_NEED_TEXT font_t font; /**< The current font */ @@ -137,7 +137,7 @@ void gwinClearInit(GWindowInit *pwi); * * @api */ -void gwinSetDefaultColor(color_t clr); +void gwinSetDefaultColor(gColor clr); /** * @brief Get the default foreground color for all new GWIN windows @@ -146,7 +146,7 @@ void gwinSetDefaultColor(color_t clr); * * @api */ -color_t gwinGetDefaultColor(void); +gColor gwinGetDefaultColor(void); /** * @brief Set the default background color for all new GWIN windows @@ -155,7 +155,7 @@ color_t gwinGetDefaultColor(void); * * @api */ -void gwinSetDefaultBgColor(color_t bgclr); +void gwinSetDefaultBgColor(gColor bgclr); /** * @brief Get the default background color for all new GWIN windows @@ -164,7 +164,7 @@ void gwinSetDefaultBgColor(color_t bgclr); * * @api */ -color_t gwinGetDefaultBgColor(void); +gColor gwinGetDefaultBgColor(void); #if GDISP_NEED_TEXT || defined(__DOXYGEN__) /** @@ -871,7 +871,7 @@ void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord s * * @api */ - color_t gwinGetPixelColor(GHandle gh, gCoord x, gCoord y); + gColor gwinGetPixelColor(GHandle gh, gCoord x, gCoord y); #endif /*------------------------------------------------- |