Some refactoring in RectContext and StarContext.

(bzr r11608.1.101)

1 files changed, 23 insertions, 10 deletions

diff --git a/src/star-context.h b/src/star-context.h
index 8c6054d24..c1e010d19 100644
--- a/src/star-context.h
+++ b/src/star-context.h
@@ -19,6 +19,8 @@
 #include <2geom/point.h>
 #include "event-context.h"
 
+#include "sp-star.h"
+
 #define SP_STAR_CONTEXT(obj) ((SPStarContext*)obj)
 #define SP_IS_STAR_CONTEXT(obj) (dynamic_cast<const SPStarContext*>((const SPEventContext*)obj))
 
@@ -27,17 +29,32 @@ public:
 	SPStarContext();
 	virtual ~SPStarContext();
 
-    SPItem *item;
-    Geom::Point center;
+	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:
+	SPStar* star;
+
+	Geom::Point center;
 
     /* Number of corners */
     gint magnitude;
+
     /* Outer/inner radius ratio */
     gdouble proportion;
+
     /* flat sides or not? */
     bool isflatsided;
+
     /* rounded corners ratio */
     gdouble rounded;
+
     // randomization
     gdouble randomized;
 
@@ -45,14 +62,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 p, guint state);
+	void finishItem();
+	void cancel();
+	void selection_changed(Inkscape::Selection* selection);
 };
 
 #endif