Reactivated application core functionality (and avoid compiler warning).
This commit is contained in:
parent
8594c5f75f
commit
7eeed4d6af
|
@ -29,7 +29,7 @@
|
||||||
*
|
*
|
||||||
* This file is part of the Contiki desktop environment
|
* This file is part of the Contiki desktop environment
|
||||||
*
|
*
|
||||||
* $Id: directory.c,v 1.1 2006/06/17 22:41:10 adamdunkels Exp $
|
* $Id: directory.c,v 1.2 2006/08/13 14:02:07 oliverschmidt Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -39,6 +39,7 @@
|
||||||
#include "contiki.h"
|
#include "contiki.h"
|
||||||
#include "cfs/cfs.h"
|
#include "cfs/cfs.h"
|
||||||
#include "ctk/ctk.h"
|
#include "ctk/ctk.h"
|
||||||
|
#include "ctk/ctk-draw.h"
|
||||||
|
|
||||||
#include "program-handler.h"
|
#include "program-handler.h"
|
||||||
|
|
||||||
|
@ -129,7 +130,7 @@ makewindow(unsigned char i)
|
||||||
CTK_WIDGET_SET_YPOS(dscs[i]->icon, y);
|
CTK_WIDGET_SET_YPOS(dscs[i]->icon, y);
|
||||||
CTK_WIDGET_ADD(&window, dscs[i]->icon);
|
CTK_WIDGET_ADD(&window, dscs[i]->icon);
|
||||||
|
|
||||||
x += strlen(dscs[i]->icon->title) + 2;
|
x += (unsigned char)strlen(dscs[i]->icon->title) + 2;
|
||||||
}
|
}
|
||||||
CTK_WIDGET_SET_YPOS(&autoexitbutton, height - 2);
|
CTK_WIDGET_SET_YPOS(&autoexitbutton, height - 2);
|
||||||
CTK_WIDGET_ADD(&window, &autoexitbutton);
|
CTK_WIDGET_ADD(&window, &autoexitbutton);
|
||||||
|
@ -269,7 +270,7 @@ PROCESS_THREAD(directory_process, ev, data)
|
||||||
} else {
|
} else {
|
||||||
for(i = 0; dscs[i] != NULL; ++i) {
|
for(i = 0; dscs[i] != NULL; ++i) {
|
||||||
if(data == (process_data_t)(dscs[i]->icon)) {
|
if(data == (process_data_t)(dscs[i]->icon)) {
|
||||||
/* program_handler_load(dscs[i]->prgname, NULL);*/
|
program_handler_load(dscs[i]->prgname, NULL);
|
||||||
if(autoexit) {
|
if(autoexit) {
|
||||||
ctk_window_close(&window);
|
ctk_window_close(&window);
|
||||||
quit();
|
quit();
|
||||||
|
|
Loading…
Reference in a new issue