diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-04 20:48:52 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-04 20:48:52 +0000 |
commit | 1f003cf9e6a6318af036b8d1df70aa4d64ea6d05 (patch) | |
tree | a7dac5cb2ba7ff75c73f1559a3cab61495f45c76 /NxWidgets/libnxwidgets | |
parent | bee0dc42f7930b2f1fa1f5a30b767cd7b797a8f4 (diff) | |
download | nuttx-1f003cf9e6a6318af036b8d1df70aa4d64ea6d05.tar.gz nuttx-1f003cf9e6a6318af036b8d1df70aa4d64ea6d05.tar.bz2 nuttx-1f003cf9e6a6318af036b8d1df70aa4d64ea6d05.zip |
Updated NxWM widgets, several NX, NxWidgets, and NxWM bug fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4699 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets')
-rw-r--r-- | NxWidgets/libnxwidgets/include/cnxwidget.hxx | 55 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxwidget.cxx | 19 |
2 files changed, 0 insertions, 74 deletions
diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx index 99e748f38..ab44b9d42 100644 --- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx @@ -124,17 +124,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. */ /** @@ -508,28 +495,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 * of the widget with focus. @@ -901,15 +866,6 @@ namespace NXWidgets } /** - * 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. * * @param isBorderless The border state. @@ -1092,17 +1048,6 @@ namespace NXWidgets } /** - * 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. * * @param font A pointer to the font to use. diff --git a/NxWidgets/libnxwidgets/src/cnxwidget.cxx b/NxWidgets/libnxwidgets/src/cnxwidget.cxx index 8b5d0cb57..483309832 100644 --- a/NxWidgets/libnxwidgets/src/cnxwidget.cxx +++ b/NxWidgets/libnxwidgets/src/cnxwidget.cxx @@ -189,10 +189,6 @@ CNxWidget::CNxWidget(CWidgetControl *pWidgetControl, m_lastClickY = 0; m_doubleClickBounds = DOUBLE_CLICK_BOUNDS; - // Set other default values - - m_refcon = 0; - // Set border size to 1 line m_borderSize.top = 1; @@ -200,7 +196,6 @@ CNxWidget::CNxWidget(CWidgetControl *pWidgetControl, m_borderSize.bottom = 1; m_borderSize.left = 1; - m_closeType = CLOSE_TYPE_CLOSE; m_rectCache = new CRectCache(this); m_widgetEventHandlers = new CWidgetEventHandlerList(this); } @@ -507,20 +502,6 @@ TNxArray<CRect> *CNxWidget::getForegroundRegions(void) } /** - * Sets this widget's reference constant. This should be unique, - * at least amongst this widget's siblings. - * - * @param refcon The reference constant. - */ - -uint32_t CNxWidget::setRefcon(uint32_t refcon) -{ - uint32_t old = m_refcon; - m_refcon = refcon; - return old; -} - -/** * Sets this widget's border state. * * @param isBorderless The border state. |