diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-05-04 17:55:17 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-05-04 17:55:17 +0200 |
| commit | 7e791910246677f9e09c0957f1805409e790f57e (patch) | |
| tree | a3e31469a99323eb6e14f928c32fd070bffb1324 /demos/modules/gwin/widgets/main.c | |
| parent | 1a0d1f1d1097ade825cdabbd693ebf7f48dcee77 (diff) | |
| parent | 9698f0a74319fa4a843783a1aa72dfca2c3fc90f (diff) | |
| download | uGFX-7e791910246677f9e09c0957f1805409e790f57e.tar.gz uGFX-7e791910246677f9e09c0957f1805409e790f57e.tar.bz2 uGFX-7e791910246677f9e09c0957f1805409e790f57e.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'demos/modules/gwin/widgets/main.c')
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index c0c26776..17f87d46 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -237,7 +237,7 @@ static void createWidgets(void) { gdispImageOpenFile(&imgYesNo, "image_yesno.gif"); gwinListItemSetImage(ghList3, 1, &imgYesNo); gwinListItemSetImage(ghList3, 3, &imgYesNo); - wi.g.x = 0+3*(LIST_WIDTH+5); wi.text = "L2"; + wi.g.x = 0+3*(LIST_WIDTH+5); wi.text = "L4"; ghList4 = gwinListCreate(0, &wi, TRUE); gwinListAddItem(ghList4, "Item 0", FALSE); gwinListAddItem(ghList4, "Item 1", FALSE); @@ -258,7 +258,7 @@ static void createWidgets(void) { // Image wi.g.x = 20; wi.g.y = 2*TAB_HEIGHT+20; wi.g.width = 200; wi.g.height = 100; ghImage1 = gwinImageCreate(0, &wi.g); - gwinImageOpenFile(ghImage1, "romfs_img_ugfx.bmp"); + gwinImageOpenFile(ghImage1, "romfs_img_ugfx.gif"); // Progressbar wi.g.show = FALSE; wi.customDraw = 0; @@ -381,16 +381,16 @@ int main(void) { // Initialize the display gfxInit(); - // Set the widget defaults - gwinSetDefaultFont(gdispOpenFont("*")); - gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); - // Connect the mouse #if GINPUT_NEED_MOUSE gwinAttachMouse(0); #endif + // Set the widget defaults + gwinSetDefaultFont(gdispOpenFont("*")); + gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); + gdispClear(White); + // Create the gwin windows/widgets createWidgets(); |