diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-10-16 10:38:03 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-10-16 10:38:03 +0000 |
commit | 71898e5c547e1f92bb128aede558938873f56d3c (patch) | |
tree | a29ddd099bdefdd00db381b064f720801f275d56 /apps/gui | |
parent | 9e0ebcc4e696ce058a35441c85afaf608d1dd25c (diff) | |
download | rockbox-71898e5c547e1f92bb128aede558938873f56d3c.tar.gz rockbox-71898e5c547e1f92bb128aede558938873f56d3c.zip |
Accept FS#9480 - centralise and organise the events in the apps/ layer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18819 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps.c | 3 | ||||
-rw-r--r-- | apps/gui/statusbar.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 47cc05aad2..4d50740182 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -61,6 +61,7 @@ | |||
61 | #include "backdrop.h" | 61 | #include "backdrop.h" |
62 | #include "quickscreen.h" | 62 | #include "quickscreen.h" |
63 | #include "pitchscreen.h" | 63 | #include "pitchscreen.h" |
64 | #include "appevents.h" | ||
64 | 65 | ||
65 | /* currently only on wps_state is needed */ | 66 | /* currently only on wps_state is needed */ |
66 | struct wps_state wps_state; | 67 | struct wps_state wps_state; |
@@ -820,7 +821,7 @@ void gui_sync_wps_init(void) | |||
820 | gui_wps_set_statusbar(&gui_wps[i], &statusbars.statusbars[i]); | 821 | gui_wps_set_statusbar(&gui_wps[i], &statusbars.statusbars[i]); |
821 | } | 822 | } |
822 | #ifdef HAVE_LCD_BITMAP | 823 | #ifdef HAVE_LCD_BITMAP |
823 | add_event(STATUSBAR_TOGGLE_EVENT, false, statusbar_toggle_handler); | 824 | add_event(GUI_EVENT_STATUSBAR_TOGGLE, false, statusbar_toggle_handler); |
824 | #endif | 825 | #endif |
825 | #if LCD_DEPTH > 1 | 826 | #if LCD_DEPTH > 1 |
826 | unload_wps_backdrop(); | 827 | unload_wps_backdrop(); |
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 7e8221461d..f36d609bad 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -30,10 +30,6 @@ | |||
30 | #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ | 30 | #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ |
31 | #define STATUSBAR_HEIGHT 8 | 31 | #define STATUSBAR_HEIGHT 8 |
32 | 32 | ||
33 | /* possibly a horrible misuse of the event system. | ||
34 | This is triggered when the statusbar setting changes */ | ||
35 | #define STATUSBAR_TOGGLE_EVENT (EVENT_CLASS_GUI|1) | ||
36 | |||
37 | struct status_info { | 33 | struct status_info { |
38 | int battlevel; | 34 | int battlevel; |
39 | int batt_charge_step; | 35 | int batt_charge_step; |