projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modify the module selection page
[bertos.git]
/
bertos
/
gui
/
leveledit.c
diff --git
a/bertos/gui/leveledit.c
b/bertos/gui/leveledit.c
index 0bac895a28d57d0ce4975574167c3ce832cad083..63c90d21ff931b5c3412f81191d9e64b2f43d338 100644
(file)
--- a/
bertos/gui/leveledit.c
+++ b/
bertos/gui/leveledit.c
@@
-38,7
+38,7
@@
#include "leveledit.h"
#include "leveledit.h"
-#include
<cfg/cfg_gfx.h>
+#include
"cfg/cfg_gfx.h"
#include <cfg/macros.h> /* MAX() */
#include <drv/kbd.h>
#include <cfg/macros.h> /* MAX() */
#include <drv/kbd.h>
@@
-46,7
+46,7
@@
#include <gui/levelbar.h>
#include <gui/levelbar.h>
-#include <
mware
/pgm.h>
+#include <
cpu
/pgm.h>
#include <gfx/text.h>
#include <gfx/font.h>
#include <gfx/text.h>
#include <gfx/font.h>
@@
-55,10
+55,7
@@
#include <gui/menubar.h>
#endif
#include <gui/menubar.h>
#endif
-// BEGIN project_grl LOCAL
#include <drv/lcd_gfx.h>
#include <drv/lcd_gfx.h>
-#include <gui/guiman.h>
-// END project_grl LOCAL
#warning FIXME: Revise me!
#warning FIXME: Revise me!
@@
-267,17
+264,8
@@
void level_edit(struct LevelEdit *lev)
}
#endif
}
#endif
-// BEGIN project_grl LOCAL
-#if 1
- //FIXME: must to this only when needed
- lcd_blitBitmap(&lcd_bitmap);
- }
- while (!(keys = GuiMan_KbdPeek()));
-#else
}
while (!(keys = kbd_peek()));
}
while (!(keys = kbd_peek()));
-#endif
-// END project_grl LOCAL
if (keys & K_CANCEL)
break;
if (keys & K_CANCEL)
break;