NxWM: Fix detection of touch events in the tool bar; Start window should not have a stop icon

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4729 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-05-13 14:36:59 +00:00
parent 6798ffe9be
commit 851773fdae
9 changed files with 195 additions and 92 deletions
@@ -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
@@ -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)
@@ -534,6 +534,17 @@ namespace NXWidgets
copyWidgetStyle(style, &m_style);
}
/**
* 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.