diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-07-02 09:36:41 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-07-02 09:36:41 +1000 |
commit | 8a11eb71aa7e4de9b98944cac88073e71e39b7fb (patch) | |
tree | 3d629b039cc6aff4fa752fc315c56e92833c7721 /src/gwin | |
parent | dc0f291350e8f44ceaf889c559f05342feacf6c9 (diff) | |
parent | 1a2e98af967d4433e98c5fa388cb816b1af46e2d (diff) | |
download | uGFX-8a11eb71aa7e4de9b98944cac88073e71e39b7fb.tar.gz uGFX-8a11eb71aa7e4de9b98944cac88073e71e39b7fb.tar.bz2 uGFX-8a11eb71aa7e4de9b98944cac88073e71e39b7fb.zip |
Merge branch 'master' into eCos
Diffstat (limited to 'src/gwin')
-rw-r--r-- | src/gwin/checkbox.h | 8 | ||||
-rw-r--r-- | src/gwin/class_gwin.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/gwin/checkbox.h b/src/gwin/checkbox.h index c124078e..2b1fb801 100644 --- a/src/gwin/checkbox.h +++ b/src/gwin/checkbox.h @@ -48,6 +48,10 @@ typedef struct GCheckboxObject { #endif } GCheckboxObject; +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief Create a checkbox window. * @return NULL if there is no resultant drawing area, otherwise a window handle. @@ -111,6 +115,10 @@ void gwinCheckboxDraw_CheckOnLeft(GWidgetObject *gw, void *param); void gwinCheckboxDraw_CheckOnRight(GWidgetObject *gw, void *param); /** @} */ +#ifdef __cplusplus +} +#endif + #endif /* _GWIN_CHECKBOX_H */ /** @} */ diff --git a/src/gwin/class_gwin.h b/src/gwin/class_gwin.h index 61a27447..995121b7 100644 --- a/src/gwin/class_gwin.h +++ b/src/gwin/class_gwin.h @@ -98,7 +98,7 @@ typedef struct gwinVMT { void (*ToggleOn) (GWidgetObject *gw, uint16_t role); // @< Process toggle on events (optional) }; #endif - #if GINPUT_NEED_TOGGLE + #if GINPUT_NEED_DIAL struct { uint16_t dialroles; // @< The roles supported for dials (0->dialroles-1) void (*DialAssign) (GWidgetObject *gw, uint16_t role, uint16_t instance); // @< Test the role and save the dial instance handle (optional) |