sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Finish integration of the LPCXpresso OLED NX example

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3523 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-04-19 01:16:40 +00:00
parent 6140acf35e
commit 418e3a2da8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/nx/nx_internal.h
View File

@ -116,8 +116,8 @@
# endif # endif
#endif #endif
#ifndef CONFIG_TOOLBAR_HEIGHT #ifndef CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT
# define CONFIG_TOOLBAR_HEIGHT 16 # define CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT 16
#endif #endif
#ifdef CONFIG_NX_MULTIUSER #ifdef CONFIG_NX_MULTIUSER

4
examples/nx/nx_main.c
View File

@ -705,7 +705,7 @@ int user_start(int argc, char *argv[])
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
message("user_start: Add toolbar to window #1\n"); 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) if (ret < 0)
{ {
goto errout_with_hwnd1; goto errout_with_hwnd1;
@ -766,7 +766,7 @@ int user_start(int argc, char *argv[])
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS #ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
message("user_start: Add toolbar to window #2\n"); 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) if (ret < 0)
{ {
goto errout_with_hwnd2; goto errout_with_hwnd2;