diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 16:31:31 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 16:31:31 -0600 |
| commit | 72754295cabf0096cbc6f2ec693f1e5e362d8c56 (patch) | |
| tree | d541af4e4c2a1ba416aa775623d658d926b282b8 /apps/examples/nxtext | |
| parent | 80ea5737ca7bbdb33ba3ccf37a7c919338876222 (diff) | |
| download | nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.gz nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.bz2 nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.zip | |
Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
Diffstat (limited to 'apps/examples/nxtext')
| -rw-r--r-- | apps/examples/nxtext/nxtext_bkgd.c | 6 | ||||
| -rw-r--r-- | apps/examples/nxtext/nxtext_popup.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index 2d65cbeae..e91ad0a91 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -71,7 +71,7 @@ static void nxbg_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 nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -99,7 +99,7 @@ const struct nx_callback_s g_nxtextcb = { nxbg_redraw, /* redraw */ nxbg_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxbg_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -199,7 +199,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxbg_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { 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) { |