Updated NxWM widgets, several NX, NxWidgets, and NxWM bug fixes

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4699 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-05-04 20:48:52 +00:00
parent 78ec889980
commit 8e45cf0546
24 changed files with 641 additions and 184 deletions
@@ -123,17 +123,6 @@ namespace NXWidgets
{
public:
/**
* Enum describing the way other widgets should behave when they try to
* close this widget.
*/
enum CloseType
{
CLOSE_TYPE_CLOSE = 0, /**< Widgets should call the close() method */
CLOSE_TYPE_HIDE = 1 /**< Widgets should call the hide() method */
};
/**
* Enum listing flags that can be set in the constructor's "flags" parameter.
*/
@@ -184,7 +173,6 @@ namespace NXWidgets
protected:
CWidgetControl *m_widgetControl; /**< The controlling widget for the display */
CRect m_rect; /**< Rectange bounding the widget. */
uint32_t m_refcon; /**< Identifying number of the widget. */
// Dragging variables
@@ -221,7 +209,6 @@ namespace NXWidgets
// Visible regions
CRectCache *m_rectCache; /**< List of the widget's visible regions. */
CloseType m_closeType; /**< Type of close method that should be called for the widget. */
WidgetBorderSize m_borderSize; /**< Size of the widget borders. */
/**
@@ -507,28 +494,6 @@ namespace NXWidgets
const nxgl_coord_t getRelativeY(void) const;
/**
* Get the reference constant for this widget.
* @return The reference constant.
*/
inline const uint32_t getRefcon(void) const
{
return m_refcon;
}
/**
* Get the type of close routine that should be called by other widgets
* interacting with this widget.
*
* @return The close type of this widget.
*/
inline const CloseType getCloseType(void)
{
return m_closeType;
}
/**
* Is the widget active?
* A value of true indicates that this widget has focus or is an ancestor
@@ -900,15 +865,6 @@ namespace NXWidgets
return m_style.colors.selectedText;
}
/**
* Sets this widget's reference constant. This should be unique,
* at least amongst this widget's siblings.
*
* @param refcon The reference constant.
*/
uint32_t setRefcon(uint32_t refcon);
/**
* Sets this widget's border state.
*
@@ -1091,17 +1047,6 @@ namespace NXWidgets
m_style.colors.selectedText = color;
}
/**
* Sets the close type other widgets should use when closing this widget.
*
* @param closeType The close type to use.
*/
inline void setCloseType(const CloseType closeType)
{
m_closeType = closeType;
}
/**
* Sets the font.
*