Sdk/BaseWidget: Fix compilation, for real
This commit is contained in:
parent
14924f0e74
commit
16d4a6ac1c
|
|
@ -42,7 +42,7 @@ namespace Ndk
|
||||||
|
|
||||||
void ClearFocus();
|
void ClearFocus();
|
||||||
|
|
||||||
inline void Destroy();
|
void Destroy();
|
||||||
|
|
||||||
void EnableBackground(bool enable);
|
void EnableBackground(bool enable);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue