diff --git a/libnxwidgets/include/clabel.hxx b/libnxwidgets/include/clabel.hxx index ccadb55ee..99e4b1ec7 100644 --- a/libnxwidgets/include/clabel.hxx +++ b/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/libnxwidgets/include/cnxwidget.hxx b/libnxwidgets/include/cnxwidget.hxx index a67938d48..d6a2654e1 100644 --- a/libnxwidgets/include/cnxwidget.hxx +++ b/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/libnxwidgets/src/clabel.cxx b/libnxwidgets/src/clabel.cxx index 319b707b6..f9132c3c2 100644 --- a/libnxwidgets/src/clabel.cxx +++ b/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/libnxwidgets/src/cnxwidget.cxx b/libnxwidgets/src/cnxwidget.cxx index 6d6ddb7b8..5060e42c2 100644 --- a/libnxwidgets/src/cnxwidget.cxx +++ b/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; } diff --git a/nxwm/src/capplicationwindow.cxx b/nxwm/src/capplicationwindow.cxx index 0c1bb1a96..c4652ca5a 100644 --- a/nxwm/src/capplicationwindow.cxx +++ b/nxwm/src/capplicationwindow.cxx @@ -334,6 +334,7 @@ bool CApplicationWindow::open(void) // Configure the label + m_windowLabel->setFont(m_windowFont); m_windowLabel->setBorderless(true); m_windowLabel->setTextAlignmentHoriz(NXWidgets::CLabel::TEXT_ALIGNMENT_HORIZ_LEFT); m_windowLabel->setTextAlignmentVert(NXWidgets::CLabel::TEXT_ALIGNMENT_VERT_CENTER);