summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets/include/ccallback.hxx
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-20 14:43:30 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-20 14:43:30 -0600
commit919f57e16e3a7319cf7d05c9342bf79c393381a0 (patch)
tree1ff7e018c937da48d5677b397df28685cfecc6bd /NxWidgets/libnxwidgets/include/ccallback.hxx
parent3ea438a0b9ebc0928f36fb7ab52b6aa2f2c64b27 (diff)
downloadnuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.tar.gz
nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.tar.bz2
nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.zip
Update ChangeLog
Diffstat (limited to 'NxWidgets/libnxwidgets/include/ccallback.hxx')
-rw-r--r--NxWidgets/libnxwidgets/include/ccallback.hxx18
1 files changed, 9 insertions, 9 deletions
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
};