diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-11-26 18:23:29 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-11-26 18:23:29 +0100 |
| commit | b7a836614008086e3f745cbe8dd95d75f1e57bf7 (patch) | |
| tree | 2cdaa1c4dc914a389df267f728ed95b20aaa34fc | |
| parent | b5d8cc20869fca140044610311ac3414437ec254 (diff) | |
| download | uGFX-b7a836614008086e3f745cbe8dd95d75f1e57bf7.tar.gz uGFX-b7a836614008086e3f745cbe8dd95d75f1e57bf7.tar.bz2 uGFX-b7a836614008086e3f745cbe8dd95d75f1e57bf7.zip | |
macro fix on src/gwin/button.c
| -rw-r--r-- | src/gwin/button.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 <string.h>
#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) {
|