From b7a836614008086e3f745cbe8dd95d75f1e57bf7 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Nov 2012 18:23:29 +0100 Subject: macro fix on src/gwin/button.c --- src/gwin/button.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gwin/button.c b/src/gwin/button.c index f62a86a4..89117fba 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -30,12 +30,12 @@ #include "gwin.h" #include "ginput.h" -#if !defined(GFX_USE_GINPUT) || !GFX_USE_GINPUT +#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) + +#if !GFX_USE_GINPUT #error "GWIN Buttons require GFX_USE_GINPUT" #endif -#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) - #include #include "gwin_internal.h" @@ -47,7 +47,7 @@ static const GButtonStyle GButtonDefaultStyle = { HTML2COLOR(0x404040), // color_dn_edge; HTML2COLOR(0x808080), // color_dn_fill; HTML2COLOR(0x404040), // color_dn_txt; - }; +}; // Process an event callback static void gwinButtonCallback(void *param, GEvent *pe) { -- cgit v1.2.3 From f1fb0a9b98551e538da15e778043c9fe39e3add9 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Nov 2012 19:56:22 +0100 Subject: Revert "macro fix on src/gwin/button.c" This reverts commit b7a836614008086e3f745cbe8dd95d75f1e57bf7. --- src/gwin/button.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/gwin/button.c b/src/gwin/button.c index 89117fba..f62a86a4 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -30,12 +30,12 @@ #include "gwin.h" #include "ginput.h" -#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) - -#if !GFX_USE_GINPUT +#if !defined(GFX_USE_GINPUT) || !GFX_USE_GINPUT #error "GWIN Buttons require GFX_USE_GINPUT" #endif +#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) + #include #include "gwin_internal.h" @@ -47,7 +47,7 @@ static const GButtonStyle GButtonDefaultStyle = { HTML2COLOR(0x404040), // color_dn_edge; HTML2COLOR(0x808080), // color_dn_fill; HTML2COLOR(0x404040), // color_dn_txt; -}; + }; // Process an event callback static void gwinButtonCallback(void *param, GEvent *pe) { -- cgit v1.2.3 From 1aef326a77d7d5428291a8eda885280a63e0e029 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Nov 2012 20:46:56 +0100 Subject: src/gwin/button.c macro fix --- src/gwin/button.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gwin/button.c b/src/gwin/button.c index f62a86a4..fce82a20 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -30,12 +30,12 @@ #include "gwin.h" #include "ginput.h" -#if !defined(GFX_USE_GINPUT) || !GFX_USE_GINPUT +#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) + +#if !GFX_USE_GINPUT #error "GWIN Buttons require GFX_USE_GINPUT" #endif -#if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) - #include #include "gwin_internal.h" -- cgit v1.2.3 From ba08afef3ec1af2412f526623156f5f50d102ec0 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 26 Nov 2012 21:19:32 +0100 Subject: doxygen --- src/gtimer.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/gtimer.c b/src/gtimer.c index 8956a190..164822f3 100644 --- a/src/gtimer.c +++ b/src/gtimer.c @@ -258,6 +258,8 @@ void gtimerStop(GTimer *pt) { * * @param[in] pt Pointer to a GTimer structure * + * @return TRUE if active, FALSE otherwise + * * @api */ bool_t gtimerIsActive(GTimer *pt) { -- cgit v1.2.3