diff --git a/src/event-context.h b/src/event-context.h
index 1e95305e5ece5b8daeb91803d3fdfe95ae85f976..37b0ea75be45136e401788b71f0c530b6a49a069 100644 (file)
--- a/src/event-context.h
+++ b/src/event-context.h
#include <gdk/gdktypes.h>
#include <gdk/gdkevents.h>
-#include <libnr/nr-forward.h>
+#include "2geom/forward.h"
+#include "preferences.h"
struct GrDrag;
struct SPDesktop;
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;
GrDrag *_grdrag;
GrDrag *get_drag () {return _grdrag;}
- KnotHolder *shape_knot_holder;
- Inkscape::XML::Node *shape_repr;
+ ShapeEditor* shape_editor;
bool space_panning;
};
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);
#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);
@@ -116,8 +116,8 @@ void sp_event_show_modifier_tip(Inkscape::MessageContext *message_context, GdkEv
guint get_group0_keyval(GdkEventKey *event);
-SPItem *sp_event_context_find_item (SPDesktop *desktop, NR::Point const p, bool select_under, bool into_groups);
-SPItem *sp_event_context_over_item (SPDesktop *desktop, SPItem *item, NR::Point const p);
+SPItem *sp_event_context_find_item (SPDesktop *desktop, Geom::Point const &p, bool select_under, bool into_groups);
+SPItem *sp_event_context_over_item (SPDesktop *desktop, SPItem *item, Geom::Point const &p);
ShapeEditor *sp_event_context_get_shape_editor (SPEventContext *ec);