diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-05-25 01:26:52 +1000 |
| commit | 7fbfde42aabbcd30cffba2fba35158236c0a6c6c (patch) | |
| tree | e85c90a4f21974b706315d64209021e0b2bde764 /src/gwin/gwin.c | |
| parent | 42006a67b5ccfd86f30d8a91cc474681c437eaf6 (diff) | |
| download | uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.gz uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.tar.bz2 uGFX-7fbfde42aabbcd30cffba2fba35158236c0a6c6c.zip | |
GOS module, for operating system independance
GMISC fast floating point trig
GMISC fast fixed point trig
Diffstat (limited to 'src/gwin/gwin.c')
| -rw-r--r-- | src/gwin/gwin.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index b6340c2d..c01c8a90 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -5,8 +5,6 @@ * http://chibios-gfx.com/license.html */ -#include "ch.h" -#include "hal.h" #include "gfx.h" #if GFX_USE_GWIN @@ -29,7 +27,7 @@ GHandle _gwinInit(GWindowObject *gw, coord_t x, coord_t y, coord_t width, coord_ // Allocate the structure if necessary if (!gw) { - if (!(gw = (GWindowObject *)chHeapAlloc(NULL, size))) + if (!(gw = (GWindowObject *)gfxAlloc(size))) return 0; gw->flags = GWIN_FLG_DYNAMIC; } else @@ -56,7 +54,8 @@ GHandle gwinCreateWindow(GWindowObject *gw, coord_t x, coord_t y, coord_t width, } void gwinSetEnabled(GHandle gh, bool_t enabled) { - + (void)gh; + (void)enabled; } void gwinDestroyWindow(GHandle gh) { @@ -66,7 +65,7 @@ void gwinDestroyWindow(GHandle gh) { case GW_BUTTON: if ((gh->flags & GBTN_FLG_ALLOCTXT)) { gh->flags &= ~GBTN_FLG_ALLOCTXT; // To be sure, to be sure - chHeapFree((void *)((GButtonObject *)gh)->txt); + gfxFree((void *)((GButtonObject *)gh)->txt); } geventDetachSource(&((GButtonObject *)gh)->listener, 0); geventDetachSourceListeners((GSourceHandle)gh); @@ -85,7 +84,7 @@ void gwinDestroyWindow(GHandle gh) { // Clean up the structure if (gh->flags & GWIN_FLG_DYNAMIC) { gh->flags = 0; // To be sure, to be sure - chHeapFree((void *)gh); + gfxFree((void *)gh); } } |