diff options
author | inmarket <andrewh@inmarket.com.au> | 2013-07-07 19:40:37 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2013-07-07 19:40:37 +1000 |
commit | 3957505ab119b21c7b0f4e72f56030c97711988a (patch) | |
tree | 5a059012d5fa0d07a93fcb70e72518bdaca1d4c5 /src/gwin/gimage.c | |
parent | de28112a7d6db829142ad113c93eb8ad071b0d65 (diff) | |
download | uGFX-3957505ab119b21c7b0f4e72f56030c97711988a.tar.gz uGFX-3957505ab119b21c7b0f4e72f56030c97711988a.tar.bz2 uGFX-3957505ab119b21c7b0f4e72f56030c97711988a.zip |
GWIN renaming, tidy up, color styles
Diffstat (limited to 'src/gwin/gimage.c')
-rw-r--r-- | src/gwin/gimage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gwin/gimage.c b/src/gwin/gimage.c index 464bc595..eef47dc7 100644 --- a/src/gwin/gimage.c +++ b/src/gwin/gimage.c @@ -16,7 +16,7 @@ #include "gwin/class_gwin.h" -#define widget(gh) ((GImageWidget*)gh) +#define widget(gh) ((GImageObject *)gh) static void _destroy(GWindowObject *gh) { if (gdispImageIsOpen(&widget(gh)->image)) @@ -80,14 +80,14 @@ static void _redraw(GHandle gh) { static const gwinVMT imageVMT = { "Image", // The class name - sizeof(GImageWidget), // The object size + sizeof(GImageObject), // The object size _destroy, // The destroy routine _redraw, // The redraw routine 0, // The after-clear routine }; -GHandle gwinImageCreate(GImageWidget *gobj, GWindowInit *pInit) { - if (!(gobj = (GImageWidget *)_gwindowCreate(&gobj->g, pInit, &imageVMT, 0))) +GHandle gwinImageCreate(GImageObject *gobj, GWindowInit *pInit) { + if (!(gobj = (GImageObject *)_gwindowCreate(&gobj->g, pInit, &imageVMT, 0))) return 0; // Ensure the gdispImageIsOpen() gives valid results |