Utility/Cursor: Add GetImage() method

include/Nazara/Utility/Cursor.hpp

@@ -10,29 +10,33 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Utility/Config.hpp>
+#include <Nazara/Utility/Image.hpp>
 
 namespace Nz
 {
 	class CursorImpl;
-	class Image;
 
 	class NAZARA_UTILITY_API Cursor
 	{
 		friend class WindowImpl;
 
 		public:
-			Cursor();
+			inline Cursor();
-			~Cursor();
+			inline ~Cursor();
 
 			bool Create(const Image& cursor, int hotSpotX = 0, int hotSpotY = 0);
 			bool Create(const Image& cursor, const Vector2i& hotSpot);
 			void Destroy();
 
-			bool IsValid() const;
+			inline const Image& GetImage() const;
+			inline bool IsValid() const;
 
 		private:
+			Image m_cursorImage;
 			CursorImpl* m_impl;
 	};
 }
 
+#include <Nazara/Utility/Cursor.inl>
+
 #endif // NAZARA_CURSOR_HPP

include/Nazara/Utility/Cursor.inl

@@ -0,0 +1,31 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Engine - Utility module"
+// For conditions of distribution and use, see copyright notice in Config.hpp
+
+#include <Nazara/Utility/Cursor.hpp>
+#include <Nazara/Utility/Debug.hpp>
+
+namespace Nz
+{
+	inline Cursor::Cursor() :
+	m_impl(nullptr)
+	{
+	}
+
+	inline Cursor::~Cursor()
+	{
+		Destroy();
+	}
+
+	inline const Image& Cursor::GetImage() const
+	{
+		return m_cursorImage;
+	}
+
+	inline bool Cursor::IsValid() const
+	{
+		return m_impl != nullptr;
+	}
+}
+
+#include <Nazara/Utility/DebugOff.hpp>

src/Nazara/Utility/Cursor.cpp

@@ -16,16 +16,6 @@
 
 namespace Nz
 {
-	Cursor::Cursor() :
-	m_impl(nullptr)
-	{
-	}
-
-	Cursor::~Cursor()
-	{
-		Destroy();
-	}
-
 	bool Cursor::Create(const Image& cursor, int hotSpotX, int hotSpotY)
 	{
 		Destroy();
@@ -40,6 +30,8 @@ namespace Nz
 			return false;
 		}
 
+		m_cursorImage = cursor;
+
 		return true;
 	}
 
@@ -58,9 +50,4 @@ namespace Nz
 			m_impl = nullptr;
 		}
 	}
-
-	bool Cursor::IsValid() const
-	{
-		return m_impl != nullptr;
-	}
 }