fix crash, allow combine to work transparently on groups

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

diff --git a/src/draw-context.h b/src/draw-context.h
index 5ac1a7d0978fe42a2d89eef2a563d4765f524dec..30ebaa61d3a024f6eeab2398747eb9baf9312385 100644 (file)
--- a/src/draw-context.h
+++ b/src/draw-context.h
@@ -19,6 +19,7 @@
 #include <forward.h>
 #include <display/display-forward.h>
 #include <libnr/nr-point.h>
+#include "live_effects/effect.h"
 
 /* Freehand context */
 
@@ -68,6 +69,9 @@ struct SPDrawContext : public SPEventContext{
     /* End anchor */
     SPDrawAnchor *ea;
 
+    /* type of the LPE that is to be applied automatically to a finished path (if any) */
+    Inkscape::LivePathEffect::EffectType waiting_LPE_type;
+
     sigc::connection sel_changed_connection;
     sigc::connection sel_modified_connection;
 
@@ -79,11 +83,12 @@ struct SPDrawContext : public SPEventContext{
 struct SPDrawContextClass : public SPEventContextClass{};
 
 GType sp_draw_context_get_type(void);
-SPDrawAnchor *spdc_test_inside(SPDrawContext *dc, NR::Point p);
+SPDrawAnchor *spdc_test_inside(SPDrawContext *dc, Geom::Point p);
 void spdc_concat_colors_and_flush(SPDrawContext *dc, gboolean forceclosed);
-void spdc_endpoint_snap_rotation(SPEventContext const *const ec, NR::Point &p, NR::Point const o, guint state);
-void spdc_endpoint_snap_free(SPEventContext const *ec, NR::Point &p, guint state);
-
+void spdc_endpoint_snap_rotation(SPEventContext const *const ec, Geom::Point &p, Geom::Point const &o, guint state);
+void spdc_endpoint_snap_free(SPEventContext const *ec, Geom::Point &p, guint state);
+void spdc_check_for_and_apply_waiting_LPE(SPDrawContext *dc, SPItem *item);
+void spdc_create_single_dot(SPEventContext *ec, Geom::Point const &pt, char const *tool, guint event_state);
 
 #endif