Replaced casting macros for EventContext tree; added contructors.

(bzr r11608.1.96)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/box3d-context.h b/src/box3d-context.h
index a724736be..98446f45c 100644
--- a/src/box3d-context.h
+++ b/src/box3d-context.h
@@ -22,10 +22,12 @@
 #include "vanishing-point.h"
 
 #define SP_TYPE_BOX3D_CONTEXT            (sp_box3d_context_get_type ())
-#define SP_BOX3D_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_BOX3D_CONTEXT, Box3DContext))
+//#define SP_BOX3D_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_BOX3D_CONTEXT, Box3DContext))
 #define SP_BOX3D_CONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_BOX3D_CONTEXT, Box3DContextClass))
-#define SP_IS_BOX3D_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_BOX3D_CONTEXT))
+//#define SP_IS_BOX3D_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_BOX3D_CONTEXT))
 #define SP_IS_BOX3D_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_BOX3D_CONTEXT))
+#define SP_BOX3D_CONTEXT(obj) ((Box3DContext*)obj)
+#define SP_IS_BOX3D_CONTEXT(obj) (((SPEventContext*)obj)->types.count(typeid(Box3DContext)))
 
 class CBox3DContext;
 
@@ -78,6 +80,7 @@ public:
 	virtual gint root_handler(GdkEvent* event);
 	virtual gint item_handler(SPItem* item, GdkEvent* event);
 
+	virtual const std::string& getPrefsPath();
 private:
 	Box3DContext* box3dcontext;
 };