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 /nuttx/libnx/nxtk/nxtk_events.c | |
| parent | 80ea5737ca7bbdb33ba3ccf37a7c919338876222 (diff) | |
| download | px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.gz px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.tar.bz2 px4-nuttx-72754295cabf0096cbc6f2ec693f1e5e362d8c56.zip | |
Rename CONFIG_NX_MOUSE to CONFIG_NX_INPUT, then add CONFIG_NX_XYINPUT_MOUSE and CONFIG_XYINPUT_TOUCHSCREEN
Diffstat (limited to 'nuttx/libnx/nxtk/nxtk_events.c')
| -rw-r--r-- | nuttx/libnx/nxtk/nxtk_events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/libnx/nxtk/nxtk_events.c b/nuttx/libnx/nxtk/nxtk_events.c index 513bc98a8..d22d04aa8 100644 --- a/nuttx/libnx/nxtk/nxtk_events.c +++ b/nuttx/libnx/nxtk/nxtk_events.c @@ -68,7 +68,7 @@ static void nxtk_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 nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); #endif @@ -92,7 +92,7 @@ const struct nx_callback_s g_nxtkcb = { nxtk_redraw, /* redraw */ nxtk_position /* position */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT , nxtk_mousein /* mousein */ #endif #ifdef CONFIG_NX_KBD @@ -218,7 +218,7 @@ static void nxtk_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, * Name: nxtk_mousein ****************************************************************************/ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) { |