Sdk/BaseWidget: Fix compilation, for real

This commit is contained in:
Jérôme Leclercq 2017-11-15 10:48:30 +01:00
parent 14924f0e74
commit 16d4a6ac1c
3 changed files with 13 additions and 13 deletions

View File

@ -42,7 +42,7 @@ namespace Ndk
void ClearFocus(); void ClearFocus();
inline void Destroy(); void Destroy();
void EnableBackground(bool enable); void EnableBackground(bool enable);

View File

@ -64,18 +64,6 @@ namespace Ndk
SetPosition(GetPosition(Nz::CoordSys_Local).x, (parentSize.y - mySize.y) / 2.f); SetPosition(GetPosition(Nz::CoordSys_Local).x, (parentSize.y - mySize.y) / 2.f);
} }
/*!
* \brief Destroy the widget, deleting it in the process.
*
* Calling this function immediately destroys the widget, freeing its memory.
*/
inline void BaseWidget::Destroy()
{
NazaraAssert(this != m_canvas, "Canvas cannot be destroyed by calling Destroy()");
m_widgetParent->DestroyChild(this); //< This does delete us
}
inline const Nz::Color& BaseWidget::GetBackgroundColor() const inline const Nz::Color& BaseWidget::GetBackgroundColor() const
{ {
return m_backgroundColor; return m_backgroundColor;

View File

@ -55,6 +55,18 @@ namespace Ndk
m_canvas->ClearKeyboardOwner(m_canvasIndex); m_canvas->ClearKeyboardOwner(m_canvasIndex);
} }
/*!
* \brief Destroy the widget, deleting it in the process.
*
* Calling this function immediately destroys the widget, freeing its memory.
*/
void BaseWidget::Destroy()
{
NazaraAssert(this != m_canvas, "Canvas cannot be destroyed by calling Destroy()");
m_widgetParent->DestroyChild(this); //< This does delete us
}
/*! /*!
* \brief Enable or disables the widget background. * \brief Enable or disables the widget background.
*/ */