diff --git a/ChangeLog.md b/ChangeLog.md index 41d026ffe..c424c02a9 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -24,6 +24,7 @@ Nazara Development Kit: - ⚠️ Renamed BaseWidget::GrabKeyboard method to SetFocus - Added BaseWidget::ClearFocus method and OnFocus[Lost|Received] virtual methods - TextAreaWidget will now show a cursor as long as it has focus +- Fix BaseWidget linking error on Linux # 0.4: diff --git a/SDK/include/NDK/BaseWidget.inl b/SDK/include/NDK/BaseWidget.inl index 948769890..6cdeed119 100644 --- a/SDK/include/NDK/BaseWidget.inl +++ b/SDK/include/NDK/BaseWidget.inl @@ -64,6 +64,18 @@ namespace Ndk 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 { return m_backgroundColor; diff --git a/SDK/src/NDK/BaseWidget.cpp b/SDK/src/NDK/BaseWidget.cpp index 8af1ef19c..ba777a544 100644 --- a/SDK/src/NDK/BaseWidget.cpp +++ b/SDK/src/NDK/BaseWidget.cpp @@ -55,18 +55,6 @@ namespace Ndk 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. */