diff --git a/core/ctk/ctk-conio.c b/core/ctk/ctk-conio.c index 783366102..993d0b0fb 100644 --- a/core/ctk/ctk-conio.c +++ b/core/ctk/ctk-conio.c @@ -29,19 +29,19 @@ * * This file is part of the "ctk" console GUI toolkit for cc65 * - * $Id: ctk-conio.c,v 1.2 2006/08/30 22:24:12 oliverschmidt Exp $ + * $Id: ctk-conio.c,v 1.3 2007/04/15 13:14:40 oliverschmidt Exp $ * */ +#include +#include #include +#include "contiki.h" + #include "ctk/ctk.h" #include "ctk-draw.h" -#include "contiki-conf.h" -#include -#include - #ifndef NULL #define NULL (void *)0 #endif /* NULL */ @@ -211,7 +211,7 @@ draw_widget(struct ctk_widget *w, } #endif /* CTK_CONF_ICON_TEXTMAPS */ - len = strlen(w->widget.icon.title); + len = (unsigned char)strlen(w->widget.icon.title); if(xpos + len >= sizex) { xpos = sizex - len; } @@ -495,10 +495,10 @@ ctk_draw_menus(struct ctk_menus *menus) /* Draw desktopmenu */ if(wherex() + strlen(menus->desktopmenu->title) + 1 >= sizex) { - gotoxy(sizex - strlen(menus->desktopmenu->title) - 1, 0); + gotoxy(sizex - (unsigned char)strlen(menus->desktopmenu->title) - 1, 0); } else { cclear(sizex - wherex() - - strlen(menus->desktopmenu->title) - 1); + (unsigned char)strlen(menus->desktopmenu->title) - 1); } draw_menu(menus->desktopmenu, menus->desktopmenu == menus->open); @@ -517,8 +517,3 @@ ctk_draw_width(void) return sizex; } /*-----------------------------------------------------------------------------------*/ -int -ctk_arch_isprint(char c) -{ - return isprint(c); -}