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 /NxWidgets/libnxwidgets/src | |
| 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 'NxWidgets/libnxwidgets/src')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/ccallback.cxx | 6 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx | 2 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index 488016162..4550d24b0 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -77,7 +77,7 @@ CCallback::CCallback(CWidgetControl *widgetControl) m_callbacks.redraw = redraw; m_callbacks.position = position; -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT m_callbacks.mousein = newMouseEvent; #endif #ifdef CONFIG_NX_KBD @@ -165,7 +165,7 @@ void CCallback::position(NXHANDLE hwnd, * nxtk_openwindow, or nxtk_opentoolbar). */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CCallback::newMouseEvent(NXHANDLE hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg) @@ -181,7 +181,7 @@ void CCallback::newMouseEvent(NXHANDLE hwnd, This->m_widgetControl->newMouseEvent(pos, buttons); } -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ /** * New keyboard/keypad data is available for the window. The new keyboard diff --git a/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx b/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx index 2cb1a930d..aab75b84c 100644 --- a/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx +++ b/NxWidgets/libnxwidgets/src/cwidgetcontrol.cxx @@ -448,7 +448,7 @@ void CWidgetControl::redrawEvent(FAR const struct nxgl_rect_s *nxRect, bool more * @param buttons See NX_MOUSE_* definitions. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CWidgetControl::newMouseEvent(FAR const struct nxgl_point_s *pos, uint8_t buttons) { // Save the mouse X/Y position diff --git a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx index 79dd97d7f..265fd7ff2 100644 --- a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx +++ b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx @@ -136,7 +136,7 @@ void CWindowEventHandlerList::raiseGeometryEvent(void) * Raise an NX mouse window input event. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void CWindowEventHandlerList::raiseMouseEvent(void) { for (int i = 0; i < m_eventHandlers.size(); ++i) |