From 16d4a6ac1cae5791d83c11b788c8a43e22e4e30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 15 Nov 2017 10:48:30 +0100 Subject: [PATCH] Sdk/BaseWidget: Fix compilation, for real --- SDK/include/NDK/BaseWidget.hpp | 2 +- SDK/include/NDK/BaseWidget.inl | 12 ------------ SDK/src/NDK/BaseWidget.cpp | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/SDK/include/NDK/BaseWidget.hpp b/SDK/include/NDK/BaseWidget.hpp index f3c943f70..2c3b6df7b 100644 --- a/SDK/include/NDK/BaseWidget.hpp +++ b/SDK/include/NDK/BaseWidget.hpp @@ -42,7 +42,7 @@ namespace Ndk void ClearFocus(); - inline void Destroy(); + void Destroy(); void EnableBackground(bool enable); diff --git a/SDK/include/NDK/BaseWidget.inl b/SDK/include/NDK/BaseWidget.inl index 6cdeed119..948769890 100644 --- a/SDK/include/NDK/BaseWidget.inl +++ b/SDK/include/NDK/BaseWidget.inl @@ -64,18 +64,6 @@ 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 ba777a544..8af1ef19c 100644 --- a/SDK/src/NDK/BaseWidget.cpp +++ b/SDK/src/NDK/BaseWidget.cpp @@ -55,6 +55,18 @@ 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. */