diff options
author | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
---|---|---|
committer | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
commit | 39bde23dd9b156b05aad549ca1d9c0e5026378fe (patch) | |
tree | cd09969caf68e02571faecc53a3b8ba8e047f716 /src/gwin/gwin_button.c | |
parent | 835f0f197f7fc7eecf5dcd36892987c71caa5caa (diff) | |
parent | ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc (diff) | |
download | uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.gz uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.bz2 uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.zip |
Merge branch 'develop'
Diffstat (limited to 'src/gwin/gwin_button.c')
-rw-r--r-- | src/gwin/gwin_button.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gwin/gwin_button.c b/src/gwin/gwin_button.c index 7d588e80..39d19d35 100644 --- a/src/gwin/gwin_button.c +++ b/src/gwin/gwin_button.c @@ -466,7 +466,7 @@ static const GColorSet *getButtonColors(GWidgetObject *gw) { sy = 0; } - gdispGImageDraw(gw->g.display, (gdispImage *)param, gw->g.x, gw->g.y, gw->g.width, gw->g.height, 0, sy); + gdispGImageDraw(gw->g.display, (gImage *)param, gw->g.x, gw->g.y, gw->g.width, gw->g.height, 0, sy); gdispGDrawStringBox(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-2, gw->text, gw->g.font, pcol->text, gJustifyCenter); } #endif |