diff options
author | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:05 +0100 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2014-02-02 13:00:05 +0100 |
commit | e50b495c48648bf53621a4afc63682579387ba4f (patch) | |
tree | 3a8d5cc53263def1a66e1dbc169d30da0a2af957 /src/gwin/gwidget.c | |
parent | 69fb0ea6ccbfb231e0fc98c2a324611cc803d691 (diff) | |
parent | 6515373b2a63a24b77ff20a26e9b18468f29a6f9 (diff) | |
download | uGFX-e50b495c48648bf53621a4afc63682579387ba4f.tar.gz uGFX-e50b495c48648bf53621a4afc63682579387ba4f.tar.bz2 uGFX-e50b495c48648bf53621a4afc63682579387ba4f.zip |
Merge branch 'master' into gfile
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); } |