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/slider.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/slider.h')
| -rw-r--r-- | include/gwin/slider.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/include/gwin/slider.h b/include/gwin/slider.h index 412900a5..1943729f 100644 --- a/include/gwin/slider.h +++ b/include/gwin/slider.h @@ -187,17 +187,30 @@ void gwinSetSliderCustom(GHandle gh, GSliderDrawFunction fn, void *param); */ #define gwinGetSliderSource(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 slider + * @details Attach a mouse to a slider * - * @param[in] gh The slider handle - * @param[in] gsh The source handle + * @param[in] gh The slider handle + * @param[in] instance The mouse instance * * @api */ - bool_t gwinAttachSliderMouseSource(GHandle gh, GSourceHandle gsh); + bool_t gwinAttachSliderMouse(GHandle gh, uint16_t instance); +#endif + +#if GFX_USE_GINPUT && GINPUT_NEED_DIAL + /** + * @brief Attach a dial source + * @details Attach a dial to a slider + * + * @param[in] gh The dial handle + * @param[in] instance The dial instance + * + * @api + */ + bool_t gwinAttachSliderDial(GHandle gh, uint16_t instance); #endif /** |