From 72754295cabf0096cbc6f2ec693f1e5e362d8c56 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 16 Jul 2014 16:31:31 -0600 Subject: Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN --- apps/examples/nxtext/nxtext_popup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/examples/nxtext/nxtext_popup.c') diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index 4fcc80c13..25c86b460 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -73,7 +73,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, FAR const struct nxgl_point_s *pos, FAR const struct nxgl_rect_s *bounds, FAR void *arg); -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -93,7 +93,7 @@ static const struct nx_callback_s g_pucb = { nxpu_redraw, /* redraw */ nxpu_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxpu_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -246,7 +246,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxpu_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxpu_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { -- cgit v1.2.3