TITANIC: In-progress converting message handling to be more like original

I currently was using multiple inheritance to define the message classes
that a class supports, but this caused problems when, for example, a
class tested to see if an object supported CMouseMsg. The class in
question supported several mouse messages, but a standard dynamic_cast
returned nullptr for the class, since it didn't directly support it

1 files changed, 6 insertions, 9 deletions

diff --git a/engines/titanic/core/view_item.h b/engines/titanic/core/view_item.h
index fc4089f924..f439929f5e 100644
--- a/engines/titanic/core/view_item.h
+++ b/engines/titanic/core/view_item.h
@@ -29,11 +29,8 @@
 
 namespace Titanic {
 
-class CViewItem : public CNamedItem,
-	public CMouseButtonDownMsgTarget,
-	public CMouseButtonUpMsgTarget,
-	public CMouseMoveMsgTarget,
-	public CMouseDoubleClickMsgTarget {
+class CViewItem : public CNamedItem {
+	DECLARE_MESSAGE_MAP
 private:
 	CTreeItem *_buttonUpTargets[4];
 private:
@@ -55,10 +52,10 @@ protected:
 	int _field50;
 	int _field54;
 protected:
-	virtual bool handleMessage(CMouseButtonDownMsg &msg);
-	virtual bool handleMessage(CMouseButtonUpMsg &msg);
-	virtual bool handleMessage(CMouseMoveMsg &msg);
-	virtual bool handleMessage(CMouseDoubleClickMsg &msg);
+	virtual bool MouseButtonDownMsg(CMouseButtonDownMsg &msg);
+	virtual bool MouseButtonUpMsg(CMouseButtonUpMsg &msg);
+	virtual bool MouseMoveMsg(CMouseMoveMsg &msg);
+	virtual bool MouseDoubleClickMsg(CMouseDoubleClickMsg &msg);
 public:
 	int _viewNumber;
 public: