diff options
Diffstat (limited to 'NxWidgets/libnxwidgets/include')
4 files changed, 7 insertions, 7 deletions
diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx index bef4a2ca9..8127dc20d 100644 --- a/NxWidgets/libnxwidgets/include/ccallback.hxx +++ b/NxWidgets/libnxwidgets/include/ccallback.hxx @@ -158,11 +158,11 @@ namespace NXWidgets * nxtk_openwindow, or nxtk_opentoolbar). */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT static void newMouseEvent(NXHANDLE hwnd, FAR const struct nxgl_point_s *pos, uint8_t buttons, FAR void *arg); -#endif /* CONFIG_NX_MOUSE */ +#endif /* CONFIG_NX_XYINPUT */ /** * New keyboard/keypad data is available for the window. The new diff --git a/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx b/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx index 379ae4725..6a8fcbf0c 100644 --- a/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx +++ b/NxWidgets/libnxwidgets/include/cwindoweventhandler.hxx @@ -94,7 +94,7 @@ namespace NXWidgets * @param e The event data. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT virtual void handleMouseEvent(void) { } #endif diff --git a/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx b/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx index a076e63cf..e677339c2 100644 --- a/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx +++ b/NxWidgets/libnxwidgets/include/cwindoweventhandlerlist.hxx @@ -149,7 +149,7 @@ namespace NXWidgets * Raise an NX mouse window input event. */ -#ifdef CONFIG_NX_MOUSE +#ifdef CONFIG_NX_XYINPUT void raiseMouseEvent(void); #endif diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx index 05c6d8422..34be7a788 100644 --- a/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx @@ -57,7 +57,7 @@ * * CONFIG_HAVE_CXX=y : C++ support is required * CONFIG_NX=y : NX graphics support must be enabled - * CONFIG_NX_MOUSE=y : Required to enable NX mouse/touchscreen support + * CONFIG_NX_XYINPUT=y : Required to enable NX mouse/touchscreen support * CONFIG_NX_KBD=y : Required to enabled NX keyboard support * CONFIG_NX_NPLANES=1 : Only a single video plane is supported * @@ -160,8 +160,8 @@ * Required to enable NX mouse/touchscreen support */ -#ifndef CONFIG_NX_MOUSE -# warning "NX mouse/touchscreen support is required (CONFIG_NX_MOUSE)" +#ifndef CONFIG_NX_XYINPUT +# warning "NX mouse/touchscreen support is required (CONFIG_NX_XYINPUT)" #endif /** |