Cleaned up a bit.

(bzr r11608.1.102)

1 files changed, 17 insertions, 9 deletions

diff --git a/src/spiral-context.h b/src/spiral-context.h
index c7cc0b1b1..65a10dd04 100644
--- a/src/spiral-context.h
+++ b/src/spiral-context.h
@@ -21,6 +21,8 @@
 #include <2geom/point.h>
 #include "event-context.h"
 
+#include "sp-spiral.h"
+
 #define SP_SPIRAL_CONTEXT(obj) ((SPSpiralContext*)obj)
 #define SP_IS_SPIRAL_CONTEXT(obj) (dynamic_cast<const SPSpiralContext*>((const SPEventContext*)obj))
 
@@ -29,7 +31,17 @@ public:
 	SPSpiralContext();
 	virtual ~SPSpiralContext();
 
-	SPItem * item;
+	static const std::string prefsPath;
+
+	virtual void setup();
+	virtual void finish();
+	virtual void set(Inkscape::Preferences::Entry* val);
+	virtual gint root_handler(GdkEvent* event);
+
+	virtual const std::string& getPrefsPath();
+
+private:
+	SPSpiral * spiral;
 	Geom::Point center;
 	gdouble revo;
 	gdouble exp;
@@ -39,14 +51,10 @@ public:
 
     Inkscape::MessageContext *_message_context;
 
-	static const std::string prefsPath;
-
-	virtual void setup();
-	virtual void finish();
-	virtual void set(Inkscape::Preferences::Entry* val);
-	virtual gint root_handler(GdkEvent* event);
-
-	virtual const std::string& getPrefsPath();
+	void drag(Geom::Point const &p, guint state);
+	void finishItem();
+	void cancel();
+	void selection_changed(Inkscape::Selection *selection);
 };
 
 #endif