summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets/include
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-20 14:18:08 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-20 14:18:08 -0600
commit4860036d8f145187cfe700743def8d0ee3548f1b (patch)
treedf2196f51b1ee2be9f6986f54da4f6056a5ebfd0 /NxWidgets/libnxwidgets/include
parent29268dcf2e63a5b3b2d9d8d9f56215819e9e3970 (diff)
downloadnuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.gz
nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.bz2
nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.zip
Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*
Diffstat (limited to 'NxWidgets/libnxwidgets/include')
-rw-r--r--NxWidgets/libnxwidgets/include/cbgwindow.hxx2
-rw-r--r--NxWidgets/libnxwidgets/include/ccallback.hxx6
-rw-r--r--NxWidgets/libnxwidgets/include/cnxtkwindow.hxx2
-rw-r--r--NxWidgets/libnxwidgets/include/cnxtoolbar.hxx2
-rw-r--r--NxWidgets/libnxwidgets/include/cnxwindow.hxx2
-rw-r--r--NxWidgets/libnxwidgets/include/inxwindow.hxx4
-rw-r--r--NxWidgets/libnxwidgets/include/nxconfig.hxx4
7 files changed, 11 insertions, 11 deletions
diff --git a/NxWidgets/libnxwidgets/include/cbgwindow.hxx b/NxWidgets/libnxwidgets/include/cbgwindow.hxx
index 0b73a01de..57c0a1675 100644
--- a/NxWidgets/libnxwidgets/include/cbgwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/cbgwindow.hxx
@@ -220,7 +220,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/ccallback.hxx b/NxWidgets/libnxwidgets/include/ccallback.hxx
index 8127dc20d..8d96f0022 100644
--- a/NxWidgets/libnxwidgets/include/ccallback.hxx
+++ b/NxWidgets/libnxwidgets/include/ccallback.hxx
@@ -49,7 +49,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
#endif
@@ -93,7 +93,7 @@ namespace NXWidgets
private:
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_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
NXCONSOLE m_nxconsole; /**< The NxConsole handle for redirection of keyboard input */
#endif
@@ -257,7 +257,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
inline void setNxConsole(NXCONSOLE handle)
{
m_nxconsole = handle;
diff --git a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
index ea18595de..5bf2a1a03 100644
--- a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx
@@ -241,7 +241,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
index 501067f0d..7a8a783b2 100644
--- a/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxtoolbar.hxx
@@ -210,7 +210,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/cnxwindow.hxx b/NxWidgets/libnxwidgets/include/cnxwindow.hxx
index 780276a5f..525a0c851 100644
--- a/NxWidgets/libnxwidgets/include/cnxwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxwindow.hxx
@@ -214,7 +214,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
inline void redirectNxConsole(NXCONSOLE handle)
{
setNxConsole(handle);
diff --git a/NxWidgets/libnxwidgets/include/inxwindow.hxx b/NxWidgets/libnxwidgets/include/inxwindow.hxx
index 826d1784e..4aa2c519b 100644
--- a/NxWidgets/libnxwidgets/include/inxwindow.hxx
+++ b/NxWidgets/libnxwidgets/include/inxwindow.hxx
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
# include <nuttx/nx/nxconsole.h>
#endif
@@ -186,7 +186,7 @@ namespace NXWidgets
* directed to the widgets within the window.
*/
-#ifdef CONFIG_NXCONSOLE_NXKBDIN
+#ifdef CONFIG_NXTERM_NXKBDIN
virtual void redirectNxConsole(NXCONSOLE handle) = 0;
#endif
diff --git a/NxWidgets/libnxwidgets/include/nxconfig.hxx b/NxWidgets/libnxwidgets/include/nxconfig.hxx
index 9face1e70..f6c9ead90 100644
--- a/NxWidgets/libnxwidgets/include/nxconfig.hxx
+++ b/NxWidgets/libnxwidgets/include/nxconfig.hxx
@@ -188,8 +188,8 @@
* reducing the AND of these three conditions to a single condition.
*/
-#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXCONSOLE)
-# undef CONFIG_NXCONSOLE_NXKBDIN
+#if !defined(CONFIG_NX_KBD) || !defined(CONFIG_NXTERM)
+# undef CONFIG_NXTERM_NXKBDIN
#endif
/* NX Server/Device Configuration *******************************************/