deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed CTK_CONF_HYPERLINK from shared code as its use is still unclear (and the implementation was incomplete anyway).

Browse source
This commit is contained in:
oliverschmidt 2007-12-15 11:34:59 +00:00
parent b32f0643ab
commit 6fd3b0dbae
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/ctk/ctk.c
View file

@ -44,7 +44,7 @@
* *
* This file is part of the Contiki operating system. * 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 /* The operation changed the focus, so we emit a "hover" signal
for those widgets that support it. */ for those widgets that support it. */
#if CTK_CONF_HYPERLINK
if(window->focused->type == CTK_WIDGET_HYPERLINK) { if(window->focused->type == CTK_WIDGET_HYPERLINK) {
process_post(window->owner, ctk_signal_hyperlink_hover, window->focused); process_post(window->owner, ctk_signal_hyperlink_hover, window->focused);
} else } else if(window->focused->type == CTK_WIDGET_BUTTON) {
#endif /* CTK_CONF_HYPERLINK */
if(window->focused->type == CTK_WIDGET_BUTTON) {
process_post(window->owner, ctk_signal_button_hover, window->focused); 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); process_post(w->window->owner, ctk_signal_widget_activate, w);
} }
#endif /* CTK_CONF_ICONS */ #endif /* CTK_CONF_ICONS */
#if CTK_CONF_HYPERLINK
} else if(w->type == CTK_WIDGET_HYPERLINK) { } else if(w->type == CTK_WIDGET_HYPERLINK) {
process_post(PROCESS_BROADCAST, ctk_signal_hyperlink_activate, w); process_post(PROCESS_BROADCAST, ctk_signal_hyperlink_activate, w);
#endif /* CTK_CONF_HYPERLINK */
} else if(w->type == CTK_WIDGET_TEXTENTRY) { } else if(w->type == CTK_WIDGET_TEXTENTRY) {
if(w->widget.textentry.state == CTK_TEXTENTRY_NORMAL) { if(w->widget.textentry.state == CTK_TEXTENTRY_NORMAL) {
w->widget.textentry.state = CTK_TEXTENTRY_EDIT; w->widget.textentry.state = CTK_TEXTENTRY_EDIT;

1
platform/win32/contiki-conf.h
View file

@ -78,7 +78,6 @@ typedef unsigned short uip_stats_t;
#define CTK_CONF_WIDGETUP_KEY -7 /* Shift-Tab */ #define CTK_CONF_WIDGETUP_KEY -7 /* Shift-Tab */
#define CTK_CONF_WIDGET_FLAGS 0 #define CTK_CONF_WIDGET_FLAGS 0
#define CTK_CONF_SCREENSAVER 0 #define CTK_CONF_SCREENSAVER 0
#define CTK_CONF_HYPERLINK 1
#ifdef PLATFORM_BUILD #ifdef PLATFORM_BUILD
#define CTK_CONF_MOUSE_SUPPORT 1 #define CTK_CONF_MOUSE_SUPPORT 1