diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-20 17:44:40 +1000 |
| commit | 2b47a0708602b45b0b5db120a496bf92232aa4b1 (patch) | |
| tree | 6c5965b6bf1d109b853efe64777bbc7ee5548882 /demos/modules/gwin/frame | |
| parent | c06bff3304ed234c3a7f96fd049755ac59228ef7 (diff) | |
| parent | 0f3f8f68f87233bf59c3fa68c3dfe1f492a1a478 (diff) | |
| download | uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.gz uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.tar.bz2 uGFX-2b47a0708602b45b0b5db120a496bf92232aa4b1.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'demos/modules/gwin/frame')
| -rw-r--r-- | demos/modules/gwin/frame/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c index 3f3d8845..fe956925 100644 --- a/demos/modules/gwin/frame/main.c +++ b/demos/modules/gwin/frame/main.c @@ -138,19 +138,19 @@ int main(void) { switch(pe->type) { case GEVENT_GWIN_SLIDER: - if (((GEventGWinSlider *)pe)->slider == ghSliderR || \ - ghSliderG || \ - ghSliderB ) { + if (((GEventGWinSlider *)pe)->gwin == ghSliderR || \ + ghSliderG || \ + ghSliderB ) { _updateColor(); } break; case GEVENT_GWIN_BUTTON: - if (((GEventGWinButton *)pe)->button == ghButton1) { + if (((GEventGWinButton *)pe)->gwin == ghButton1) { gwinSliderSetPosition(ghSliderR, rand() % 256); - } else if (((GEventGWinButton *)pe)->button == ghButton2) { + } else if (((GEventGWinButton *)pe)->gwin == ghButton2) { gwinSliderSetPosition(ghSliderG, rand() % 256); - } else if (((GEventGWinButton *)pe)->button == ghButton3) { + } else if (((GEventGWinButton *)pe)->gwin == ghButton3) { gwinSliderSetPosition(ghSliderB, rand() % 256); } |