From 6fd3b0dbaed462f948b01379975e7404e71a4067 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sat, 15 Dec 2007 11:34:59 +0000 Subject: [PATCH] Removed CTK_CONF_HYPERLINK from shared code as its use is still unclear (and the implementation was incomplete anyway). --- core/ctk/ctk.c | 9 ++------- platform/win32/contiki-conf.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/core/ctk/ctk.c b/core/ctk/ctk.c index 24e0c6659..7aafe3673 100644 --- a/core/ctk/ctk.c +++ b/core/ctk/ctk.c @@ -44,7 +44,7 @@ * * This file is part of the Contiki operating system. * - * $Id: ctk.c,v 1.13 2007/12/14 23:38:00 oliverschmidt Exp $ + * $Id: ctk.c,v 1.14 2007/12/15 11:34:59 oliverschmidt Exp $ * */ @@ -1005,12 +1005,9 @@ select_widget(struct ctk_widget *focus) /* The operation changed the focus, so we emit a "hover" signal for those widgets that support it. */ -#if CTK_CONF_HYPERLINK if(window->focused->type == CTK_WIDGET_HYPERLINK) { process_post(window->owner, ctk_signal_hyperlink_hover, window->focused); - } else -#endif /* CTK_CONF_HYPERLINK */ - if(window->focused->type == CTK_WIDGET_BUTTON) { + } else if(window->focused->type == CTK_WIDGET_BUTTON) { process_post(window->owner, ctk_signal_button_hover, window->focused); } @@ -1183,10 +1180,8 @@ activate(CC_REGISTER_ARG struct ctk_widget *w) process_post(w->window->owner, ctk_signal_widget_activate, w); } #endif /* CTK_CONF_ICONS */ -#if CTK_CONF_HYPERLINK } else if(w->type == CTK_WIDGET_HYPERLINK) { process_post(PROCESS_BROADCAST, ctk_signal_hyperlink_activate, w); -#endif /* CTK_CONF_HYPERLINK */ } else if(w->type == CTK_WIDGET_TEXTENTRY) { if(w->widget.textentry.state == CTK_TEXTENTRY_NORMAL) { w->widget.textentry.state = CTK_TEXTENTRY_EDIT; diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h index dec8f031a..396207f34 100644 --- a/platform/win32/contiki-conf.h +++ b/platform/win32/contiki-conf.h @@ -78,7 +78,6 @@ typedef unsigned short uip_stats_t; #define CTK_CONF_WIDGETUP_KEY -7 /* Shift-Tab */ #define CTK_CONF_WIDGET_FLAGS 0 #define CTK_CONF_SCREENSAVER 0 -#define CTK_CONF_HYPERLINK 1 #ifdef PLATFORM_BUILD #define CTK_CONF_MOUSE_SUPPORT 1