diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-11-12 01:31:40 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-11-12 01:31:40 +0100 |
| commit | 5f75abcc0148f42e250bb8f3e20c527af5e7ca39 (patch) | |
| tree | 245233fe7f476b337ae9ed9790cf4e5ceef8e76f | |
| parent | 91bcb0d41d74392e20be7fa26ba3d7a28c0ba240 (diff) | |
| parent | 9f69a6c9d5f9bd1a8fca73247326138a6cdbf11d (diff) | |
| download | uGFX-5f75abcc0148f42e250bb8f3e20c527af5e7ca39.tar.gz uGFX-5f75abcc0148f42e250bb8f3e20c527af5e7ca39.tar.bz2 uGFX-5f75abcc0148f42e250bb8f3e20c527af5e7ca39.zip | |
Merge branch 'master' of bitbucket.org:Tectu/ugfx
| -rw-r--r-- | include/gdisp/gdisp.h | 4 | ||||
| -rw-r--r-- | include/gwin/label.h | 10 | ||||
| -rw-r--r-- | include/gwin/list.h | 12 |
3 files changed, 2 insertions, 24 deletions
diff --git a/include/gdisp/gdisp.h b/include/gdisp/gdisp.h index 09dab71a..99b1a504 100644 --- a/include/gdisp/gdisp.h +++ b/include/gdisp/gdisp.h @@ -232,7 +232,7 @@ GDisplay *gdispGetDisplay(unsigned display); * value. * @note If a NULL is passed for the dispay this call is ignored. * - * @param[in] g The display number (0..n) + * @param[in] g The display to use * * @api */ @@ -254,7 +254,7 @@ void gdispSetDisplay(GDisplay *g); * Calling it again won't hurt though. * * - * @param[in] g The display number (0..n) + * @param[in] g The display to use * * @api */ diff --git a/include/gwin/label.h b/include/gwin/label.h index caa4c1d1..3fe0f3d7 100644 --- a/include/gwin/label.h +++ b/include/gwin/label.h @@ -63,16 +63,6 @@ GHandle gwinGLabelCreate(GDisplay *g, GLabelObject *widget, GWidgetInit *pInit); */ void gwinLabelSetBorder(GHandle gh, bool_t border); -/** - * @brief Border settings for the default rendering routine - * - * @param[in] gh The widget handle (must be a list handle) - * @param[in] border Shall a border be rendered? - * - * @api - */ -void gwinLabelSetBorder(GHandle gh, bool_t border); - #ifdef __cplusplus } #endif diff --git a/include/gwin/list.h b/include/gwin/list.h index 11815d05..4052f53f 100644 --- a/include/gwin/list.h +++ b/include/gwin/list.h @@ -107,18 +107,6 @@ GHandle gwinGListCreate(GDisplay *g, GListObject *widget, GWidgetInit *pInit, bo void gwinListSetScroll(GHandle gh, scroll_t flag); /** - * @brief Change the behaviour of the scroll bar - * - * @note Current possible values: @p scrollAlways and @p scrollAuto - * - * @param[in] gh The widget handle (must be a list handle) - * @param[in] flag The behaviour to be set - * - * @api - */ -void gwinListSetScroll(GHandle gh, scroll_t flag); - -/** * @brief Add an item to the list * * @note The ID you get returned is not static. If items get removed from the list, the list items get |