summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-17 13:38:37 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-17 13:38:37 -0600
commit5224b2220ada479a416f26c73ee5a72f1b78be3a (patch)
treed36ec0adcb74dfc75a5c60620787d477951596d0 /NxWidgets/libnxwidgets
parentbba0b13f8057a52ff6d341482c89dd965d65ac40 (diff)
downloadnuttx-5224b2220ada479a416f26c73ee5a72f1b78be3a.tar.gz
nuttx-5224b2220ada479a416f26c73ee5a72f1b78be3a.tar.bz2
nuttx-5224b2220ada479a416f26c73ee5a72f1b78be3a.zip
NxWM::CApplicationWindow: Created the custom font for the toolbar title, but never used it.
Diffstat (limited to 'NxWidgets/libnxwidgets')
-rw-r--r--NxWidgets/libnxwidgets/include/clabel.hxx2
-rw-r--r--NxWidgets/libnxwidgets/include/cnxwidget.hxx2
-rw-r--r--NxWidgets/libnxwidgets/src/clabel.cxx2
-rw-r--r--NxWidgets/libnxwidgets/src/cnxwidget.cxx3
4 files changed, 9 insertions, 0 deletions
diff --git a/NxWidgets/libnxwidgets/include/clabel.hxx b/NxWidgets/libnxwidgets/include/clabel.hxx
index ccadb55ee..99e4b1ec7 100644
--- a/NxWidgets/libnxwidgets/include/clabel.hxx
+++ b/NxWidgets/libnxwidgets/include/clabel.hxx
@@ -333,6 +333,8 @@ namespace NXWidgets
* Sets the font.
*
* @param font A pointer to the font to use.
+ *
+ * NOTE: This font is not deleted when the widget is destroyed!
*/
virtual void setFont(CNxFont *font);
diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx
index a67938d48..d6a2654e1 100644
--- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx
+++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx
@@ -1012,6 +1012,8 @@ namespace NXWidgets
* Sets the font.
*
* @param font A pointer to the font to use.
+ *
+ * NOTE: This font is not deleted when the widget is destroyed!
*/
virtual void setFont(CNxFont *font);
diff --git a/NxWidgets/libnxwidgets/src/clabel.cxx b/NxWidgets/libnxwidgets/src/clabel.cxx
index 319b707b6..f9132c3c2 100644
--- a/NxWidgets/libnxwidgets/src/clabel.cxx
+++ b/NxWidgets/libnxwidgets/src/clabel.cxx
@@ -252,6 +252,8 @@ void CLabel::getPreferredDimensions(CRect &rect) const
* Sets the font.
*
* @param font A pointer to the font to use.
+ *
+ * NOTE: This font is not deleted when the widget is destroyed!
*/
void CLabel::setFont(CNxFont *font)
diff --git a/NxWidgets/libnxwidgets/src/cnxwidget.cxx b/NxWidgets/libnxwidgets/src/cnxwidget.cxx
index 6d6ddb7b8..5060e42c2 100644
--- a/NxWidgets/libnxwidgets/src/cnxwidget.cxx
+++ b/NxWidgets/libnxwidgets/src/cnxwidget.cxx
@@ -466,6 +466,8 @@ void CNxWidget::setBorderless(bool borderless)
* Sets the font.
*
* @param font A pointer to the font to use.
+ *
+ * NOTE: This font is not deleted when the widget is destroyed!
*/
void CNxWidget::setFont(CNxFont *font)
@@ -1408,6 +1410,7 @@ const CNxWidget *CNxWidget::getChild(int index) const
{
return m_children[index];
}
+
return (CNxWidget *)NULL;
}