diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-24 08:41:48 -0700 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-24 08:41:48 -0700 |
| commit | f0569e2555b3a7f2afe05cc42e4dd0982b179167 (patch) | |
| tree | e85c90a4f21974b706315d64209021e0b2bde764 /src/gwin/button.c | |
| parent | 5f2a32714cda6bcfc8829e61895def2f627e1b8f (diff) | |
| parent | 7fbfde42aabbcd30cffba2fba35158236c0a6c6c (diff) | |
| download | uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.tar.gz uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.tar.bz2 uGFX-f0569e2555b3a7f2afe05cc42e4dd0982b179167.zip | |
Merge pull request #73 from inmarket/master
GOS module for OS independance, GMISC additions
Diffstat (limited to 'src/gwin/button.c')
| -rw-r--r-- | src/gwin/button.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gwin/button.c b/src/gwin/button.c index 8d77b8ba..19301698 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -15,8 +15,6 @@ * @{ */ -#include "ch.h" -#include "hal.h" #include "gfx.h" #if (GFX_USE_GWIN && GWIN_NEED_BUTTON) || defined(__DOXYGEN__) @@ -204,7 +202,7 @@ void gwinSetButtonText(GHandle gh, const char *txt, bool_t useAlloc) { if ((gh->flags & GBTN_FLG_ALLOCTXT)) { gh->flags &= ~GBTN_FLG_ALLOCTXT; if (gbw->txt) { - chHeapFree((void *)gbw->txt); + gfxFree((void *)gbw->txt); gbw->txt = ""; } } @@ -212,7 +210,7 @@ void gwinSetButtonText(GHandle gh, const char *txt, bool_t useAlloc) { if (txt && useAlloc) { char *str; - if ((str = (char *)chHeapAlloc(NULL, strlen(txt)+1))) { + if ((str = (char *)gfxAlloc(strlen(txt)+1))) { gh->flags |= GBTN_FLG_ALLOCTXT; strcpy(str, txt); } |