diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-07-02 19:26:48 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-07-02 19:26:48 +0200 |
| commit | 3f80e1f89dbeec06dd97a914d6851ad4596b1743 (patch) | |
| tree | be9087bf08cb186f521aa5a68a7f32a484f1f7e0 /include | |
| parent | ad57ab7967d0e0ee3cfce8746b0c4969cfe970fd (diff) | |
| download | uGFX-3f80e1f89dbeec06dd97a914d6851ad4596b1743.tar.gz uGFX-3f80e1f89dbeec06dd97a914d6851ad4596b1743.tar.bz2 uGFX-3f80e1f89dbeec06dd97a914d6851ad4596b1743.zip | |
label work in progress - not working anymore
Diffstat (limited to 'include')
| -rw-r--r-- | include/gevent/gevent.h | 2 | ||||
| -rw-r--r-- | include/gwin/gwin.h | 10 | ||||
| -rw-r--r-- | include/gwin/label.h | 11 | ||||
| -rw-r--r-- | include/gwin/options.h | 14 |
4 files changed, 26 insertions, 11 deletions
diff --git a/include/gevent/gevent.h b/include/gevent/gevent.h index b0039849..5868f70f 100644 --- a/include/gevent/gevent.h +++ b/include/gevent/gevent.h @@ -48,7 +48,7 @@ typedef uint16_t GEventType; typedef union GEvent_u { GEventType type; // The type of this event char pad[GEVENT_MAXIMUM_SIZE]; // This is here to allow static initialisation of GEventObject's in the application. - } GEvent; +} GEvent; // A special callback function typedef void (*GEventCallbackFn)(void *param, GEvent *pe); diff --git a/include/gwin/gwin.h b/include/gwin/gwin.h index 10aabf6f..21d465b2 100644 --- a/include/gwin/gwin.h +++ b/include/gwin/gwin.h @@ -129,8 +129,16 @@ extern "C" { * @api */ void gwinSetDefaultFont(font_t font); - #endif + /** + * @brief Get the current default font + * + * @return The current default font + * + * @api + */ + font_t gwinGetDefaultFont(void); + #endif /*------------------------------------------------- * Base functions diff --git a/include/gwin/label.h b/include/gwin/label.h index ed774ed7..d387345d 100644 --- a/include/gwin/label.h +++ b/include/gwin/label.h @@ -31,9 +31,7 @@ // An label window typedef struct GLabelWidget_t { - GWindowObject g; - - const char* text; + GWidgetObject w; } GLabelWidget; #ifdef __cplusplus @@ -51,12 +49,7 @@ extern "C" { * * @api */ -GHandle gwinLabelCreate(GLabelWidget *widget, GWindowInit *pInit); -void gwinLabelSetColor(GHandle gh, color_t color); -void gwinLabelSetBgColor(GHandle gh, color_t bgColor); -void gwinLabelSetFont(GHandle gh, font_t font); -void gwinLabelSetText(GHandle gh, const char* text); -void gwinLabelDraw(GHandle gh); +GHandle gwinLabelCreate(GLabelWidget *widget, GWidgetInit *pInit); #ifdef __cplusplus } diff --git a/include/gwin/options.h b/include/gwin/options.h index cc164259..11ab7d44 100644 --- a/include/gwin/options.h +++ b/include/gwin/options.h @@ -69,6 +69,20 @@ #ifndef GWIN_NEED_CHECKBOX #define GWIN_NEED_CHECKBOX FALSE #endif + /** + * @brief Should image functions be included. + * @details Defaults to FALSE + */ + #ifndef GWIN_NEED_IMAGE + #define GWIN_NEED_IMAGE FALSE + #endif + /** + * @brief Should label functions be included. + * @details Defaults to FALSE + */ + #ifndef GWIN_NEED_LABEL + #define GWIN_NEED_LABEL FALSE + #endif /** * @} * |