Merge remote-tracking branch 'origin/dev_aaron' into emulator

This commit is contained in:
t-moe
2015-06-01 22:16:00 +02:00
8 changed files with 277 additions and 127 deletions

View File

@@ -104,14 +104,14 @@ static void enter(void* screen) {
n_updown.max=11;
n_updown.min =-5;
n_updown.callback=n_updown_cb;
gui_numupdown_add(&n_updown);
//gui_numupdown_add(&n_updown);
}
static void leave(void* screen) {
gui_button_remove(&b_back);
gui_checkbox_remove(&c_cbox);
gui_numupdown_remove(&n_updown);
//gui_numupdown_remove(&n_updown);
touch_unregister_area(&a_area);
}