mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-02 04:39:01 +00:00
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
This commit is contained in:
parent
6140acf35e
commit
418e3a2da8
2 changed files with 4 additions and 4 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue