now that selection description includes style (filtered, clipped), we need to update...

[inkscape.git] / src / event-context.h

diff --git a/src/event-context.h b/src/event-context.h
index fbffc40656332b635292fcf6bda52d91e9070b9f..df4aa6eab4070252ff07425613cd0be6838056e6 100644 (file)
--- a/src/event-context.h
+++ b/src/event-context.h
@@ -21,12 +21,12 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkevents.h>
 
-#include <2geom/forward.h>
+#include "2geom/forward.h"
+#include "preferences.h"
 
 struct GrDrag;
 struct SPDesktop;
 struct SPItem;
-class KnotHolder;
 class ShapeEditor;
 
 namespace Inkscape {
@@ -48,7 +48,7 @@ struct SPEventContext : public GObject {
     SPEventContext *next;
     unsigned key;
     SPDesktop *desktop;
-    Inkscape::XML::Node *prefs_repr;
+    Inkscape::Preferences::Observer *pref_observer;
     gchar const *const *cursor_shape;
     gint hot_x, hot_y; ///< indicates the cursor's hot spot
     GdkCursor *cursor;
@@ -71,8 +71,7 @@ struct SPEventContext : public GObject {
     GrDrag *_grdrag;
     GrDrag *get_drag () {return _grdrag;}
 
-    KnotHolder *shape_knot_holder;
-    Inkscape::XML::Node *shape_repr;
+    ShapeEditor* shape_editor;
 
     bool space_panning;
 };
@@ -83,7 +82,7 @@ struct SPEventContext : public GObject {
 struct SPEventContextClass : public GObjectClass {
     void (* setup)(SPEventContext *ec);
     void (* finish)(SPEventContext *ec);
-    void (* set)(SPEventContext *ec, gchar const *key, gchar const *val);
+    void (* set)(SPEventContext *ec, Inkscape::Preferences::Entry *val);
     void (* activate)(SPEventContext *ec);
     void (* deactivate)(SPEventContext *ec);
     gint (* root_handler)(SPEventContext *ec, GdkEvent *event);
@@ -95,7 +94,7 @@ struct SPEventContextClass : public GObjectClass {
 
 #define SP_EVENT_CONTEXT_STATIC 0
 
-SPEventContext *sp_event_context_new(GType type, SPDesktop *desktop, Inkscape::XML::Node *prefs_repr, unsigned key);
+SPEventContext *sp_event_context_new(GType type, SPDesktop *desktop, gchar const *pref_path, unsigned key);
 void sp_event_context_finish(SPEventContext *ec);
 void sp_event_context_read(SPEventContext *ec, gchar const *key);
 void sp_event_context_activate(SPEventContext *ec);