diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-19 01:01:00 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-19 01:01:00 +0000 |
commit | a591b9ca86b86684f2804cedf5d0c17a3614e913 (patch) | |
tree | b60235b0a038088298aa0f5497411fcb453c424d /NxWidgets/libnxwidgets/src | |
parent | 6cf694d2da5a661373a58c70e3d8e07cc8223eed (diff) | |
download | px4-nuttx-a591b9ca86b86684f2804cedf5d0c17a3614e913.tar.gz px4-nuttx-a591b9ca86b86684f2804cedf5d0c17a3614e913.tar.bz2 px4-nuttx-a591b9ca86b86684f2804cedf5d0c17a3614e913.zip |
NxWM: Add a missing part of the message blocking logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4748 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets/src')
-rw-r--r-- | NxWidgets/libnxwidgets/src/ccallback.cxx | 13 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/NxWidgets/libnxwidgets/src/ccallback.cxx b/NxWidgets/libnxwidgets/src/ccallback.cxx index 32c5b7d64..b2256c6bb 100644 --- a/NxWidgets/libnxwidgets/src/ccallback.cxx +++ b/NxWidgets/libnxwidgets/src/ccallback.cxx @@ -211,22 +211,23 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh, * callbacks can lead to bad behavior when the callback is executed. * * @param hwnd. Window handle of the blocked window - * @param arg. User provided argument (see nx_openwindow, nx_requestbkgd, + * @param arg1. User provided argument (see nx_openwindow, nx_requestbkgd, * nxtk_openwindow, or nxtk_opentoolbar) + * @param arg2 - User provided argument (see nx_block or nxtk_block) */ #ifdef CONFIG_NX_MULTIUSER -void CCallback::windowBlocked(NXWINDOW hwnd, FAR void *arg) +void CCallback::windowBlocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2) { - gvdbg("hwnd=%p arg=%p\n", hwnd, arg); + gvdbg("hwnd=%p arg1=%p arg2=%p\n", hwnd, arg1, arg2); - // The argument must be the CWidgetControl instance + // The first argument must be the CWidgetControl instance - CWidgetControl *This = (CWidgetControl *)arg; + CWidgetControl *This = (CWidgetControl *)arg1; // Just forward the callback to the CWidgetControl::windowBlocked method - This->windowBlocked(); + This->windowBlocked(arg2); } #endif diff --git a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx index 15b2c65ff..dfdabcf08 100644 --- a/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx +++ b/NxWidgets/libnxwidgets/src/cwindoweventhandlerlist.cxx @@ -162,12 +162,14 @@ void CWindowEventHandlerList::raiseKeyboardEvent(void) /** * Raise an NX window blocked event. + * + * @param arg - User provided argument (see nx_block or nxtk_block) */ -void CWindowEventHandlerList::raiseBlockedEvent(void) +void CWindowEventHandlerList::raiseBlockedEvent(FAR void *arg) { for (int i = 0; i < m_eventHandlers.size(); ++i) { - m_eventHandlers.at(i)->handleBlockedEvent(); + m_eventHandlers.at(i)->handleBlockedEvent(arg); } } |