diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:25 +0100 |
| commit | e178b08549bd0bf3e2a8d235518a60ea05681962 (patch) | |
| tree | 58091e888e7712a659f21e04258c6a49eca22442 /src/gwin/gwidget.c | |
| parent | 3c99e6e67dfa9833e25ebd417ccbd45a2d4493f6 (diff) | |
| parent | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (diff) | |
| download | uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.gz uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.tar.bz2 uGFX-e178b08549bd0bf3e2a8d235518a60ea05681962.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'src/gwin/gwidget.c')
| -rw-r--r-- | src/gwin/gwidget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gwin/gwidget.c b/src/gwin/gwidget.c index db9dc9fa..484b8c37 100644 --- a/src/gwin/gwidget.c +++ b/src/gwin/gwidget.c @@ -338,7 +338,7 @@ void gwinSetText(GHandle gh, const char *text, bool_t useAlloc) { else if (useAlloc) { char *str; - if ((str = (char *)gfxAlloc(strlen(text)+1))) { + if ((str = gfxAlloc(strlen(text)+1))) { gh->flags |= GWIN_FLG_ALLOCTXT; strcpy(str, text); } |