fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 05:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

NxWM: Add a missing part of the message blocking logic

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4748 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-05-19 01:01:00 +00:00
parent 2acf00c2cd
commit dd202a4aa7
23 changed files with 122 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/include/nuttx/nx/nx.h
+6 -3
View File
@@ -209,8 +209,9 @@ struct nx_callback_s
*
* Input Parameters:
* hwnd - Window handle of the blocked window
* arg - User provided argument (see nx_openwindow, nx_requestbkgd,
* arg1 - User provided argument (see nx_openwindow, nx_requestbkgd,
* nxtk_openwindow, or nxtk_opentoolbar)
* arg2 - User provided argument (see nx_block or nxtk_block)
*
* Returned Value:
* None
@@ -218,7 +219,7 @@ struct nx_callback_s
**************************************************************************/
#ifdef CONFIG_NX_MULTIUSER
void (*blocked)(NXWINDOW hwnd, FAR void *arg);
void (*blocked)(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2);
#endif
};
@@ -487,6 +488,8 @@ EXTERN int nx_closewindow(NXWINDOW hwnd);
*
* Input Parameters:
* wnd - The window to be blocked
* arg - An argument that will accompany the block messages (This is arg2
* in the blocked callback).
*
* Return:
* OK on success; ERROR on failure with errno set appropriately
@@ -494,7 +497,7 @@ EXTERN int nx_closewindow(NXWINDOW hwnd);
****************************************************************************/
#ifdef CONFIG_NX_MULTIUSER
EXTERN int nx_block(NXWINDOW hwnd);
EXTERN int nx_block(NXWINDOW hwnd, FAR void *arg);
#endif
/****************************************************************************
nuttx/include/nuttx/nx/nxtk.h
+3 -1
View File
@@ -173,6 +173,8 @@ EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd);
*
* Input Parameters:
* hfwnd - The window to be blocked
* arg - An argument that will accompany the block messages (This is arg2
* in the blocked callback).
*
* Return:
* OK on success; ERROR on failure with errno set appropriately
@@ -180,7 +182,7 @@ EXTERN int nxtk_closewindow(NXTKWINDOW hfwnd);
****************************************************************************/
#ifdef CONFIG_NX_MULTIUSER
EXTERN int nxtk_block(NXTKWINDOW hfwnd);
EXTERN int nxtk_block(NXTKWINDOW hfwnd, FAR void *arg);
#endif
/****************************************************************************