aboutsummaryrefslogtreecommitdiffstats
path: root/demos/modules/gwin/progressbar
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-05-09 21:46:32 +1000
committerinmarket <andrewh@inmarket.com.au>2014-05-09 21:46:32 +1000
commit21aac3d8532c9aa1decab30c00d9f5a37067aa13 (patch)
treec874ac8494028f09461e4329f0bcfae8c0e5adb8 /demos/modules/gwin/progressbar
parentf7fa0dd78f3b807578d99cc0eefe40996b1f9037 (diff)
parent1478fdf41e3731cafacd22ff6f530fb724c02df3 (diff)
downloaduGFX-21aac3d8532c9aa1decab30c00d9f5a37067aa13.tar.gz
uGFX-21aac3d8532c9aa1decab30c00d9f5a37067aa13.tar.bz2
uGFX-21aac3d8532c9aa1decab30c00d9f5a37067aa13.zip
Merge branch 'master' into gwin
Diffstat (limited to 'demos/modules/gwin/progressbar')
-rw-r--r--demos/modules/gwin/progressbar/gfxconf.h1
-rw-r--r--demos/modules/gwin/progressbar/main.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/demos/modules/gwin/progressbar/gfxconf.h b/demos/modules/gwin/progressbar/gfxconf.h
index 4ea487b9..6af70faf 100644
--- a/demos/modules/gwin/progressbar/gfxconf.h
+++ b/demos/modules/gwin/progressbar/gfxconf.h
@@ -82,6 +82,7 @@
#define GWIN_NEED_IMAGE_ANIMATION FALSE
#define GWIN_NEED_LIST_IMAGES FALSE
#define GWIN_NEED_PROGRESSBAR TRUE
+#define GWIN_PROGRESSBAR_AUTO TRUE
/* Features for the GINPUT sub-system. */
#define GINPUT_NEED_MOUSE TRUE
diff --git a/demos/modules/gwin/progressbar/main.c b/demos/modules/gwin/progressbar/main.c
index 960a3293..6fb53c2e 100644
--- a/demos/modules/gwin/progressbar/main.c
+++ b/demos/modules/gwin/progressbar/main.c
@@ -5,9 +5,7 @@ GHandle ghProgressbar;
static void _createWidget(void) {
GWidgetInit wi;
- wi.customDraw = 0;
- wi.customParam = 0;
- wi.customStyle = 0;
+ gwinWidgetClearInit(&wi);
wi.g.show = TRUE;
wi.g.y = 10; wi.g.x = 10; wi.g.width = 200; wi.g.height = 20; wi.text = "Progress 1";