aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@seriouslyembedded.com>2016-02-21 13:32:32 +0100
committerJoel Bodenmann <joel@seriouslyembedded.com>2016-02-21 13:32:32 +0100
commit3d78787b07ce9c2dafe0869dfd54b734181b7dd6 (patch)
tree852ca628ce000a8bf5cf6c1972d70662ca6b5b11
parent3a840480edda367902cc71416e37f6eb92bce438 (diff)
downloaduGFX-3d78787b07ce9c2dafe0869dfd54b734181b7dd6.tar.gz
uGFX-3d78787b07ce9c2dafe0869dfd54b734181b7dd6.tar.bz2
uGFX-3d78787b07ce9c2dafe0869dfd54b734181b7dd6.zip
Adding missing default definitions of several macros
-rw-r--r--src/gos/gos_options.h12
-rw-r--r--src/gwin/gwin_options.h23
2 files changed, 35 insertions, 0 deletions
diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h
index 0c6fd7a7..5c051fea 100644
--- a/src/gos/gos_options.h
+++ b/src/gos/gos_options.h
@@ -195,6 +195,18 @@
#ifndef GFX_OS_HEAP_SIZE
#define GFX_OS_HEAP_SIZE 0
#endif
+ /**
+ * @brief Enable wrappers for malloc() and free()
+ * @details Defaults to FALSE
+ * @note If enabled, malloc() and free() will be implemented as wrappers that call gfxAlloc() and
+ * gfxFree() in order to provide portability to libraries using these function.
+ * @note Enabling this can solve 'unresolved _sbrk' issues
+ * @note It is strongly recommended to always use gfxAlloc() and gfxFree() directy to ensure
+ * portability of uGFX applications across all platforms.
+ */
+ #ifndef GFX_EMULATE_MALLOC
+ #define GFX_EMULATE_MALLOC FALSE
+ #endif
/** @} */
#endif /* _GOS_OPTIONS_H */
diff --git a/src/gwin/gwin_options.h b/src/gwin/gwin_options.h
index ab3e284a..6bf59d2a 100644
--- a/src/gwin/gwin_options.h
+++ b/src/gwin/gwin_options.h
@@ -136,6 +136,13 @@
#define GWIN_NEED_RADIO FALSE
#endif
/**
+ * @brief Should list widget functions be included.
+ * @details Defaults to FALSE
+ */
+ #ifndef GWIN_NEED_LIST
+ #define GWIN_NEED_LIST FALSE
+ #endif
+ /**
* @brief Should tabset functions be included.
* @details Defaults to FALSE
*/
@@ -308,6 +315,22 @@
#define GWIN_NEED_IMAGE_ANIMATION FALSE
#endif
/**
+ * @brief Enable the API to use attributes in the label widget
+ * @details Defaults to FALSE
+ * @note Using this feature is discouraged. The proper (and faster as well
+ * as more efficient) way is to use two separate labels.
+ */
+ #ifndef GWIN_LABEL_ATTRIBUTE
+ #define GWIN_LABEL_ATTRIBUTE FALSE
+ #endif
+ /**
+ * @brief Enable the API to use images in items in the list widget
+ * @details Defaults to FALSE
+ */
+ #ifndef GWIN_NEED_LIST_IMAGES
+ #define GWIN_NEED_LIST_IMAGES FALSE
+ #endif
+ /**
* @brief Enable the API to automatically increment the progressbar over time
* @details Defaults to FALSE
*/