diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-13 14:36:59 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-13 14:36:59 +0000 |
commit | 193f6fa1764c7d1d88efced8af88c785ebff891f (patch) | |
tree | ad7cd2e11ec8b196ca588de12508afb294a689c8 /NxWidgets/libnxwidgets/include | |
parent | dddc850bfc8afdd0fb6e02d1541636931abaa70a (diff) | |
download | nuttx-193f6fa1764c7d1d88efced8af88c785ebff891f.tar.gz nuttx-193f6fa1764c7d1d88efced8af88c785ebff891f.tar.bz2 nuttx-193f6fa1764c7d1d88efced8af88c785ebff891f.zip |
NxWM: Fix detection of touch events in the tool bar; Start window should not have a stop icon
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4729 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets/include')
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxtkwindow.hxx | 9 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx index 32d634182..4c379754a 100644 --- a/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx +++ b/NxWidgets/libnxwidgets/include/cnxtkwindow.hxx @@ -112,7 +112,7 @@ namespace NXWidgets * @param widgetControl Controlling widget for this window. */ - CNxTkWindow(NXHANDLE hNxServer, CWidgetControl *pWidgetControl); + CNxTkWindow(NXHANDLE hNxServer, CWidgetControl *widgetControl); /** * Destructor. @@ -143,10 +143,15 @@ namespace NXWidgets * the toolbar object AND calls the INxWindow::open() method to * create the toolbar. The toolbar is ready for use upon return. * + * @param height. The height in rows of the tool bar + * @param widgetControl. The controlling widget for this window. If + * none is provided, then a new, vanilla CWidgetControl will be created + * for the tool bar. * @return True if the toolbar was successfully created. */ - CNxToolbar *openToolbar(nxgl_coord_t height); + CNxToolbar *openToolbar(nxgl_coord_t height, + CWidgetControl *widgetControl = (CWidgetControl *)0); /** * Detach the toolbar. This should *ONLY* be called by the toolbar diff --git a/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx b/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx index 4a54469d8..565e9cc36 100644 --- a/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx +++ b/NxWidgets/libnxwidgets/include/cwidgetcontrol.hxx @@ -526,7 +526,7 @@ namespace NXWidgets /** * Get the default widget style for this window. * - * @return Pointer to the clicked widget. + * @param style. The location to return the widget's style */ inline void getWidgetStyle(CWidgetStyle *style) @@ -535,6 +535,17 @@ namespace NXWidgets } /** + * Set the default widget style for this window. + * + * @param style. The new widget style to copy. + */ + + inline void setWidgetStyle(const CWidgetStyle *style) + { + copyWidgetStyle(&m_style, style); + } + + /** * These remaining methods are used by the CCallback instance to * provide notifications of certain events. */ |