TONY: Added virtual destructors to classes using virtual methods

4 files changed, 12 insertions, 12 deletions

diff --git a/engines/tony/custom.h b/engines/tony/custom.h
index ee85c8dd41..57d726f70e 100644
--- a/engines/tony/custom.h
+++ b/engines/tony/custom.h
@@ -44,13 +44,7 @@
  *                                                                        *
  * This source code is Copyright (C) Nayma Software.  ALL RIGHTS RESERVED *
  *                                                                        *
- **************************************************************************
-
-/** RCS
- *
- * $Id: $
- *
- **/
+ **************************************************************************/
 
 #ifndef TONY_CUSTOM_H
 #define TONY_CUSTOM_H
@@ -67,8 +61,6 @@ using namespace MPAL;
 
 typedef uint32 HWND;
 
-typedef void __declspec(dllexport) (*INIT_CUSTOM_FUNCTION_TYPE)(HWND, LPCUSTOMFUNCTION *);
-
 #define INIT_CUSTOM_FUNCTION					MapCustomFunctions
 #define INIT_CUSTOM_FUNCTION_STRING		"MapCustomFunctions"
 
diff --git a/engines/tony/font.h b/engines/tony/font.h
index a8a9aabb19..33332db9f0 100644
--- a/engines/tony/font.h
+++ b/engines/tony/font.h
@@ -78,8 +78,8 @@ private:
     public:
         RMFontPrimitive() : RMGfxPrimitive() {}
         RMFontPrimitive(RMGfxTask *task) : RMGfxPrimitive(task) {}
-
-        virtual RMGfxPrimitive* Duplicate() { return new RMFontPrimitive(*this); }
+		virtual ~RMFontPrimitive() { }
+        virtual RMGfxPrimitive *Duplicate() { return new RMFontPrimitive(*this); }
 
         int m_nChar;
     };
diff --git a/engines/tony/gfxcore.h b/engines/tony/gfxcore.h
index 708e3adfa8..0f2c2553ec 100644
--- a/engines/tony/gfxcore.h
+++ b/engines/tony/gfxcore.h
@@ -152,6 +152,8 @@ public:
 		m_task = task; m_dst.TopLeft() = dst; m_src.SetEmpty(); m_bFlag = 0;
     }
 
+	virtual ~RMGfxPrimitive() { }
+
     void SetFlag(byte bFlag)		{ m_bFlag=bFlag; }
 	void SetTask(RMGfxTask *task)   { m_task = task; }
     void SetSrc(const RMRect &src)        { m_src = src; }
@@ -185,6 +187,7 @@ protected:
 public:
 	// Costruttore standard
     RMGfxTask();
+	virtual ~RMGfxTask() { }
 
 	virtual int Priority();
     virtual void Draw(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) = 0;
@@ -201,6 +204,7 @@ public:
  */
 class RMGfxTaskSetPrior : public RMGfxTask {
 public:
+	virtual ~RMGfxTaskSetPrior() { }
     void SetPriority(int nPrior);
 };
 
@@ -210,6 +214,8 @@ public:
  */
 class RMGfxClearTask : public RMGfxTask {
 public:
+	virtual ~RMGfxClearTask() { }
+
 	int Priority();
     void Draw(RMGfxTargetBuffer& bigBuf, RMGfxPrimitive* prim);
 	bool RemoveThis();
@@ -224,6 +230,8 @@ protected:
 	uint16 wFillColor;
 
 public:
+	virtual ~RMGfxBox() { }
+
 	void SetColor(byte r, byte g, byte b);
 	void Draw(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim);
 	bool RemoveThis();
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index 1c08028b91..95cd4fbbdc 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -33,7 +33,7 @@
 
 #include "tony/mpal/mpal.h"
 #include "tony/mpal/memory.h"
-#include "tony/gfxEngine.h"
+#include "tony/gfxengine.h"
 #include "tony/loc.h"
 #include "tony/utils.h"
 #include "tony/window.h"