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/src/ccallback.cxx | |
| parent | 3ea438a0b9ebc0928f36fb7ab52b6aa2f2c64b27 (diff) | |
| download | nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.tar.gz nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.tar.bz2 nuttx-919f57e16e3a7319cf7d05c9342bf79c393381a0.zip | |
Update ChangeLog
Diffstat (limited to 'NxWidgets/libnxwidgets/src/ccallback.cxx')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/ccallback.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index cec7ea1bf..46108acf3 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -45,7 +45,7 @@ #include <debug.h> #ifdef CONFIG_NXTERM_NXKBDIN -# include <nuttx/nx/nxconsole.h> +# include <nuttx/nx/nxterm.h> #endif #include "cwidgetcontrol.hxx" @@ -88,7 +88,7 @@ CCallback::CCallback(CWidgetControl *widgetControl) // Keyboard input is initially direct to the widgets within the window #ifdef CONFIG_NXTERM_NXKBDIN - m_nxconsole = (NXCONSOLE)0; + m_nxterm = (NXTERM)0; #endif } @@ -206,15 +206,15 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh, CCallback *This = (CCallback *)arg; // Is NX keyboard input being directed to the widgets within the window - // (default) OR is NX keyboard input being re-directed to an NxConsole + // (default) OR is NX keyboard input being re-directed to an NxTerm // driver? #ifdef CONFIG_NXTERM_NXKBDIN - if (This->m_nxconsole) + if (This->m_nxterm) { - // Keyboard input is going to an NxConsole + // Keyboard input is going to an NxTerm - nxcon_kbdin(This->m_nxconsole, str, nCh); + nxcon_kbdin(This->m_nxterm, str, nCh); } else #endif |