diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-19 01:16:40 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-19 01:16:40 +0000 |
commit | 6307d71a343657595bac35731061dab9e9937c65 (patch) | |
tree | 662df13862b934cede2069055a7cf020eee794f4 /apps | |
parent | 02834f24e9ba0a19a0bd04cf345ea24e69553213 (diff) | |
download | nuttx-6307d71a343657595bac35731061dab9e9937c65.tar.gz nuttx-6307d71a343657595bac35731061dab9e9937c65.tar.bz2 nuttx-6307d71a343657595bac35731061dab9e9937c65.zip |
Finish integration of the LPCXpresso OLED NX example
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3523 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/examples/nx/nx_internal.h | 4 | ||||
-rw-r--r-- | apps/examples/nx/nx_main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/examples/nx/nx_internal.h b/apps/examples/nx/nx_internal.h index 3af7329a4..2f41fba42 100644 --- a/apps/examples/nx/nx_internal.h +++ b/apps/examples/nx/nx_internal.h @@ -116,8 +116,8 @@ # endif #endif -#ifndef CONFIG_TOOLBAR_HEIGHT -# define CONFIG_TOOLBAR_HEIGHT 16 +#ifndef CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT +# define CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT 16 #endif #ifdef CONFIG_NX_MULTIUSER diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c index 48f4a11d5..3f0578e3f 100644 --- a/apps/examples/nx/nx_main.c +++ b/apps/examples/nx/nx_main.c @@ -705,7 +705,7 @@ int user_start(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS message("user_start: Add toolbar to window #1\n"); - ret = nxeq_opentoolbar(hwnd1, CONFIG_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[0]); + ret = nxeq_opentoolbar(hwnd1, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[0]); if (ret < 0) { goto errout_with_hwnd1; @@ -766,7 +766,7 @@ int user_start(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS message("user_start: Add toolbar to window #2\n"); - ret = nxeq_opentoolbar(hwnd2, CONFIG_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[1]); + ret = nxeq_opentoolbar(hwnd2, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[1]); if (ret < 0) { goto errout_with_hwnd2; |