Merge branch 'master' of bitbucket.org:Tectu/ugfx

ugfx_release_2.6
Joel Bodenmann 2013-11-12 01:31:40 +01:00
commit 5f75abcc01
3 changed files with 2 additions and 24 deletions

View File

@ -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
*/

View File

@ -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

View File

@ -106,18 +106,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
*