diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:43:30 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:43:30 -0600 |
commit | 919f57e16e3a7319cf7d05c9342bf79c393381a0 (patch) | |
tree | 1ff7e018c937da48d5677b397df28685cfecc6bd /NxWidgets/libnxwidgets/include | |
parent | 3ea438a0b9ebc0928f36fb7ab52b6aa2f2c64b27 (diff) | |
download | nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.tar.gz nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.tar.bz2 nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.zip |
Update ChangeLog
Diffstat (limited to 'NxWidgets/libnxwidgets/include')
-rw-r--r-- | NxWidgets/libnxwidgets/include/cbgwindow.hxx | 14 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/ccallback.hxx | 18 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxtkwindow.hxx | 14 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxtoolbar.hxx | 14 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxwindow.hxx | 14 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/inxwindow.hxx | 14 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/nxconfig.hxx | 2 |
7 files changed, 45 insertions, 45 deletions
diff --git a/NxWidgets/libnxwidgets/include/cbgwindow.hxx b/NxWidgets/libnxwidgets/include/cbgwindow.hxx index 57c0a1675..90113cfe9 100644 --- a/NxWidgets/libnxwidgets/include/cbgwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cbgwindow.hxx @@ -209,21 +209,21 @@ namespace NXWidgets /** * Each window implementation also inherits from CCallback. CCallback, * by default, forwards NX keyboard input to the various widgets residing - * in the window. But NxConsole is a different usage model; In this case, - * keyboard input needs to be directed to the NxConsole character driver. + * in the window. But NxTerm is a different usage model; In this case, + * keyboard input needs to be directed to the NxTerm character driver. * This method can be used to enable (or disable) redirection of NX - * keyboard input from the window widgets to the NxConsole + * keyboard input from the window widgets to the NxTerm * - * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard - * input will be directed to the NxConsole driver using this + * @param handle. The NXTERM handle. If non-NULL, NX keyboard + * input will be directed to the NxTerm driver using this * handle; If NULL (the default), NX keyboard input will be * directed to the widgets within the window. */ #ifdef CONFIG_NXTERM_NXKBDIN - inline void redirectNxConsole(NXCONSOLE handle) + inline void redirectNxTerm(NXTERM handle) { - setNxConsole(handle); + setNxTerm(handle); } #endif diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx index 8d96f0022..ef1d3f81d 100644 --- a/NxWidgets/libnxwidgets/include/ccallback.hxx +++ b/NxWidgets/libnxwidgets/include/ccallback.hxx @@ -50,7 +50,7 @@ #include <nuttx/nx/nx.h> #ifdef CONFIG_NXTERM_NXKBDIN -# include <nuttx/nx/nxconsole.h> +# include <nuttx/nx/nxterm.h> #endif #include "crect.hxx" @@ -94,7 +94,7 @@ namespace NXWidgets CWidgetControl *m_widgetControl; /**< The widget control instance for this window */ struct nx_callback_s m_callbacks; /**< C-callable vtable of callback function pointers */ #ifdef CONFIG_NXTERM_NXKBDIN - NXCONSOLE m_nxconsole; /**< The NxConsole handle for redirection of keyboard input */ + NXTERM m_nxterm; /**< The NxTerm handle for redirection of keyboard input */ #endif // Methods in the callback vtable @@ -245,22 +245,22 @@ namespace NXWidgets /** * By default, NX keyboard input is given to the various widgets - * residing in the window. But NxConsole is a different usage model; - * In this case, keyboard input needs to be directed to the NxConsole + * residing in the window. But NxTerm is a different usage model; + * In this case, keyboard input needs to be directed to the NxTerm * character driver. This method can be used to enable (or disable) * redirection of NX keyboard input from the window widgets to the - * NxConsole + * NxTerm * - * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard - * input will be directed to the NxConsole driver using this + * @param handle. The NXTERM handle. If non-NULL, NX keyboard + * input will be directed to the NxTerm driver using this * handle; If NULL (the default), NX keyboard input will be * directed to the widgets within the window. */ #ifdef CONFIG_NXTERM_NXKBDIN - inline void setNxConsole(NXCONSOLE handle) + inline void setNxTerm(NXTERM handle) { - m_nxconsole = handle; + m_nxterm = handle; } #endif }; diff --git a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx index 5bf2a1a03..b20bc2a24 100644 --- a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx @@ -230,21 +230,21 @@ namespace NXWidgets /** * Each window implementation also inherits from CCallback. CCallback, * by default, forwards NX keyboard input to the various widgets residing - * in the window. But NxConsole is a different usage model; In this case, - * keyboard input needs to be directed to the NxConsole character driver. + * in the window. But NxTerm is a different usage model; In this case, + * keyboard input needs to be directed to the NxTerm character driver. * This method can be used to enable (or disable) redirection of NX - * keyboard input from the window widgets to the NxConsole + * keyboard input from the window widgets to the NxTerm * - * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard - * input will be directed to the NxConsole driver using this + * @param handle. The NXTERM handle. If non-NULL, NX keyboard + * input will be directed to the NxTerm driver using this * handle; If NULL (the default), NX keyboard input will be * directed to the widgets within the window. */ #ifdef CONFIG_NXTERM_NXKBDIN - inline void redirectNxConsole(NXCONSOLE handle) + inline void redirectNxTerm(NXTERM handle) { - setNxConsole(handle); + setNxTerm(handle); } #endif diff --git a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx index 7a8a783b2..fd635b206 100644 --- a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx @@ -199,21 +199,21 @@ namespace NXWidgets /** * Each window implementation also inherits from CCallback. CCallback, * by default, forwards NX keyboard input to the various widgets residing - * in the window. But NxConsole is a different usage model; In this case, - * keyboard input needs to be directed to the NxConsole character driver. + * in the window. But NxTerm is a different usage model; In this case, + * keyboard input needs to be directed to the NxTerm character driver. * This method can be used to enable (or disable) redirection of NX - * keyboard input from the window widgets to the NxConsole + * keyboard input from the window widgets to the NxTerm * - * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard - * input will be directed to the NxConsole driver using this + * @param handle. The NXTERM handle. If non-NULL, NX keyboard + * input will be directed to the NxTerm driver using this * handle; If NULL (the default), NX keyboard input will be * directed to the widgets within the window. */ #ifdef CONFIG_NXTERM_NXKBDIN - inline void redirectNxConsole(NXCONSOLE handle) + inline void redirectNxTerm(NXTERM handle) { - setNxConsole(handle); + setNxTerm(handle); } #endif diff --git a/NxWidgets/libnxwidgets/include/cnxwindow.hxx b/NxWidgets/libnxwidgets/include/cnxwindow.hxx index 525a0c851..98f89acc0 100644 --- a/NxWidgets/libnxwidgets/include/cnxwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwindow.hxx @@ -203,21 +203,21 @@ namespace NXWidgets /** * Each window implementation also inherits from CCallback. CCallback, * by default, forwards NX keyboard input to the various widgets residing - * in the window. But NxConsole is a different usage model; In this case, - * keyboard input needs to be directed to the NxConsole character driver. + * in the window. But NxTerm is a different usage model; In this case, + * keyboard input needs to be directed to the NxTerm character driver. * This method can be used to enable (or disable) redirection of NX - * keyboard input from the window widgets to the NxConsole + * keyboard input from the window widgets to the NxTerm * - * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard - * input will be directed to the NxConsole driver using this + * @param handle. The NXTERM handle. If non-NULL, NX keyboard + * input will be directed to the NxTerm driver using this * handle; If NULL (the default), NX keyboard input will be * directed to the widgets within the window. */ #ifdef CONFIG_NXTERM_NXKBDIN - inline void redirectNxConsole(NXCONSOLE handle) + inline void redirectNxTerm(NXTERM handle) { - setNxConsole(handle); + setNxTerm(handle); } #endif diff --git a/NxWidgets/libnxwidgets/include/inxwindow.hxx b/NxWidgets/libnxwidgets/include/inxwindow.hxx index 4aa2c519b..3e2f6c4a1 100644 --- a/NxWidgets/libnxwidgets/include/inxwindow.hxx +++ b/NxWidgets/libnxwidgets/include/inxwindow.hxx @@ -48,7 +48,7 @@ #include <stdbool.h> #ifdef CONFIG_NXTERM_NXKBDIN -# include <nuttx/nx/nxconsole.h> +# include <nuttx/nx/nxterm.h> #endif /**************************************************************************** @@ -175,19 +175,19 @@ namespace NXWidgets /** * Each window implementation also inherits from CCallback. CCallback, * by default, forwards NX keyboard input to the various widgets residing - * in the window. But NxConsole is a different usage model; In this case, - * keyboard input needs to be directed to the NxConsole character driver. + * in the window. But NxTerm is a different usage model; In this case, + * keyboard input needs to be directed to the NxTerm character driver. * This method can be used to enable (or disable) redirection of NX - * keyboard input from the window widgets to the NxConsole + * keyboard input from the window widgets to the NxTerm * - * @param handle. The NXCONSOLE handle. If non-NULL, NX keyboard - * input will be directed to the NxConsole driver using this + * @param handle. The NXTERM handle. If non-NULL, NX keyboard + * input will be directed to the NxTerm driver using this * handle; If NULL (the default), NX keyboard input will be * directed to the widgets within the window. */ #ifdef CONFIG_NXTERM_NXKBDIN - virtual void redirectNxConsole(NXCONSOLE handle) = 0; + virtual void redirectNxTerm(NXTERM handle) = 0; #endif /** diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx index f6c9ead90..6043811a6 100644 --- a/NxWidgets/libnxwidgets/include/nxconfig.hxx +++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx @@ -184,7 +184,7 @@ # error "Only a single color plane is supported (CONFIG_NX_NPLANES)" #endif -/* NxConsole checks. This just simplifies the conditional compilation by +/* NxTerm checks. This just simplifies the conditional compilation by * reducing the AND of these three conditions to a single condition. */ |