diff options
| author | Joel Bodenmann <joel@unormal.org> | 2012-11-26 19:56:22 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2012-11-26 19:56:22 +0100 |
| commit | f1fb0a9b98551e538da15e778043c9fe39e3add9 (patch) | |
| tree | fcb202fb077e7d78e1381e5ef531bbf96dcca3cf /src/gwin | |
| parent | b7a836614008086e3f745cbe8dd95d75f1e57bf7 (diff) | |
| download | uGFX-f1fb0a9b98551e538da15e778043c9fe39e3add9.tar.gz uGFX-f1fb0a9b98551e538da15e778043c9fe39e3add9.tar.bz2 uGFX-f1fb0a9b98551e538da15e778043c9fe39e3add9.zip | |
Revert "macro fix on src/gwin/button.c"
This reverts commit b7a836614008086e3f745cbe8dd95d75f1e57bf7.
Diffstat (limited to 'src/gwin')
| -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 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 <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) {
|