uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

New label attribute is const. Also updated comments.

ugfx_release_2.6
inmarket 2014-04-29 09:00:06 +10:00
parent a0b11f764b
commit 56b8dfc72f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gwin/label.c
View File

@ -164,7 +164,7 @@ void gwinLabelSetBorder(GHandle gh, bool_t border) {
}
#if GWIN_LABEL_ATTRIBUTE
void gwinLabelSetAttribute(GHandle gh, coord_t tab, char* attr) {
void gwinLabelSetAttribute(GHandle gh, coord_t tab, const char* attr) {
// is it a valid handle?
if (gh->vmt != (gwinVMT *)&labelVMT)
return;

12
src/gwin/label.h
View File

@ -35,7 +35,7 @@ typedef struct GLabelObject {
#if GWIN_LABEL_ATTRIBUTE
coord_t tab;
char* attr;
const char* attr;
#endif
} GLabelObject;
@ -70,7 +70,7 @@ void gwinLabelSetBorder(GHandle gh, bool_t border);
#if GWIN_LABEL_ATTRIBUTE
/**
* @brief Add an attribute in front of the actualy label text
* @brief Add an text attribute in front of the normal label text
* @detail Often you want to display a text like this:
* Current IP: 192.168.1.42
* In that case, the actual IP will be variable, the text in front of it
@ -80,7 +80,11 @@ void gwinLabelSetBorder(GHandle gh, bool_t border);
* Please check out the website for further explanation, illustraions and usage
* examples.
*
* @note The attribute text is currently not being allocated
* @note The attribute text is not copied into private memory and so it
* must be a constant string, not one allocated in a stack buffer.
* @note Use of this construct is discouraged. The appropriate way is to
* create two labels - one for the static text and one for the
* dynamic text.
*
* @param[in] gh The widget handle (must be a label handle)
* @param[in] tab The distance of the label text from the left widget edge
@ -88,7 +92,7 @@ void gwinLabelSetBorder(GHandle gh, bool_t border);
*
* @api
*/
void gwinLabelSetAttribute(GHandle gh, coord_t tab, char* attr);
void gwinLabelSetAttribute(GHandle gh, coord_t tab, const char* attr);
#endif
#ifdef __cplusplus