diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-01-09 08:47:27 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-01-09 08:47:27 +1000 |
| commit | f657477fdd024d19d04962a527c91541f524a3dd (patch) | |
| tree | 590c35514143b8fe1e397e0d6726bbc62332397a /include | |
| parent | fb29f601f1d5e4c74af9c0d7f53cdf9b57f2cb85 (diff) | |
| parent | 1791bec3483a27843dd279c51023526ced836aa3 (diff) | |
| download | uGFX-f657477fdd024d19d04962a527c91541f524a3dd.tar.gz uGFX-f657477fdd024d19d04962a527c91541f524a3dd.tar.bz2 uGFX-f657477fdd024d19d04962a527c91541f524a3dd.zip | |
Merge branch 'master' into gfile
Diffstat (limited to 'include')
| -rw-r--r-- | include/gdisp/gdisp.h | 2 | ||||
| -rw-r--r-- | include/gwin/gwin.h | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h index 8f379bfd..d1d78145 100644 --- a/include/gdisp/gdisp.h +++ b/include/gdisp/gdisp.h @@ -681,8 +681,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co * * @param[in] g The display to use * @param[in] x,y The position for the text - * @param[in] font The font to use * @param[in] str The string to draw + * @param[in] font The font to use * @param[in] color The color to use * * @api diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h index 96055376..e964bc3a 100644 --- a/include/gwin/gwin.h +++ b/include/gwin/gwin.h @@ -276,6 +276,24 @@ extern "C" { #define gwinSetBgColor(gh, bgclr) (gh)->bgcolor = (bgclr) /** + * @brief Get the foreground color of a window + * + * @param[in] gh The window + * + * @api + */ + #define gwinGetColor(gh) (gh)->color + + /** + * @brief Get the background color of a window + * + * @param[in] gh The window + * + * @api + */ + #define gwinGetBgColor(gh) (gh)->bgcolor + + /** * @brief Sets whether a window is visible or not * * @param[in] gh The window |