diff options
| author | Tectu <joel@unormal.org> | 2013-04-07 02:59:42 -0700 |
|---|---|---|
| committer | Tectu <joel@unormal.org> | 2013-04-07 02:59:42 -0700 |
| commit | 1d24b6977dd86d7fa68e5ddd451722430b371b78 (patch) | |
| tree | 393c6669e4d683c84f53749e6ab189044d00f265 /include/gwin/button.h | |
| parent | 05aebebb8bcaa6213076ebf5e191974bb5741d46 (diff) | |
| parent | 5412fa559673f46cdec652068eaaddcbb6271779 (diff) | |
| download | uGFX-1d24b6977dd86d7fa68e5ddd451722430b371b78.tar.gz uGFX-1d24b6977dd86d7fa68e5ddd451722430b371b78.tar.bz2 uGFX-1d24b6977dd86d7fa68e5ddd451722430b371b78.zip | |
Merge pull request #63 from inmarket/master
GINPUT Dial. Simplify input -> GWIN widget assignment
Diffstat (limited to 'include/gwin/button.h')
| -rw-r--r-- | include/gwin/button.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/include/gwin/button.h b/include/gwin/button.h index 2df540da..3d54afbb 100644 --- a/include/gwin/button.h +++ b/include/gwin/button.h @@ -180,30 +180,28 @@ void gwinSetButtonCustom(GHandle gh, GButtonDrawFunction fn, void *param); */ #define gwinGetButtonSource(gh) ((GSourceHandle)(gh)) -#if defined(GINPUT_NEED_MOUSE) && GINPUT_NEED_MOUSE +#if GFX_USE_GINPUT && GINPUT_NEED_MOUSE /** - * @brief Attach a mouse source - * @details Attach a mouse source to a given button + * @brief Attach a mouse to a button * - * @param[in] gh The button handle - * @param[in] gsh The source handle + * @param[in] gh The button handle + * @param[in] instance The mouse instance * * @api */ - bool_t gwinAttachButtonMouseSource(GHandle gh, GSourceHandle gsh); + bool_t gwinAttachButtonMouse(GHandle gh, uint16_t instance); #endif -#if defined(GINPUT_NEED_TOGGLE) && GINPUT_NEED_TOGGLE +#if GFX_USE_GINPUT && GINPUT_NEED_TOGGLE /** - * @brief Attach a toggle source - * @details Attach a toggle source to this button + * @brief Attach a toggle to a button * - * @param[in] gh The button handle - * @param[in] gsh The source handle + * @param[in] gh The button handle + * @param[in] instance The toggle instance * * @api */ - bool_t gwinAttachButtonToggleSource(GHandle gh, GSourceHandle gsh); + bool_t gwinAttachButtonToggle(GHandle gh, uint16_t instance); #endif /** |