Replaced casting macros for EventContext tree; added contructors.

(bzr r11608.1.96)

1 files changed, 5 insertions, 2 deletions

diff --git a/src/arc-context.h b/src/arc-context.h
index 7ab4ee884..c7ff339f4 100644
--- a/src/arc-context.h
+++ b/src/arc-context.h
@@ -22,10 +22,12 @@
 #include "event-context.h"
 
 #define SP_TYPE_ARC_CONTEXT            (sp_arc_context_get_type())
-#define SP_ARC_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_ARC_CONTEXT, SPArcContext))
+//#define SP_ARC_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_ARC_CONTEXT, SPArcContext))
 #define SP_ARC_CONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_ARC_CONTEXT, SPArcContextClass))
-#define SP_IS_ARC_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_ARC_CONTEXT))
+//#define SP_IS_ARC_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_ARC_CONTEXT))
 #define SP_IS_ARC_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_ARC_CONTEXT))
+#define SP_ARC_CONTEXT(obj) ((SPArcContext*)obj)
+#define SP_IS_ARC_CONTEXT(obj) (((SPEventContext*)obj)->types.count(typeid(SPArcContext)))
 
 class CArcContext;
 
@@ -57,6 +59,7 @@ public:
 	virtual gint root_handler(GdkEvent* event);
 	virtual gint item_handler(SPItem* item, GdkEvent* event);
 
+	virtual const std::string& getPrefsPath();
 private:
 	SPArcContext* sparccontext;
 };