X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Ftool%2Fnode-tool.h;h=bcf6a8d5e63709dca4f85ddaecbb454a9bf5a9a9;hb=0dc33d4ce43e0bb49c63aa53b826ec4a1ff68e28;hp=65b16ff72172e8ffb80a2bc0da335cb70bc176ef;hpb=c635a682d950f1421ca59bdb63e2bf83db697ad3;p=inkscape.git

diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index 65b16ff72..bcf6a8d5e 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -12,11 +12,11 @@
 #define SEEN_UI_TOOL_NODE_TOOL_H
 
 #include <memory>
+#include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "forward.h"
-#include "display/display-forward.h"
 #include "ui/tool/node-types.h"
 
 #define INK_TYPE_NODE_TOOL               (ink_node_tool_get_type ())
@@ -29,18 +29,23 @@ class InkNodeTool;
 class InkNodeToolClass;
 
 namespace Inkscape {
+
+namespace Display {
+class TemporaryItem;
+} // namespace Display
 namespace UI {
 class MultiPathManipulator;
 class ControlPointSelection;
 class Selector;
 struct PathSharedData;
-}
-}
+} // namespace UI
+} // namespace Inkscape
 
 typedef std::auto_ptr<Inkscape::UI::MultiPathManipulator> MultiPathPtr;
 typedef std::auto_ptr<Inkscape::UI::ControlPointSelection> CSelPtr;
 typedef std::auto_ptr<Inkscape::UI::Selector> SelectorPtr;
 typedef std::auto_ptr<Inkscape::UI::PathSharedData> PathSharedDataPtr;
+typedef boost::ptr_map<SPItem*, ShapeEditor> ShapeEditors;
 
 struct InkNodeTool : public SPEventContext
 {
@@ -55,9 +60,14 @@ struct InkNodeTool : public SPEventContext
     SelectorPtr _selector;
     PathSharedDataPtr _path_data;
     SPCanvasGroup *_transform_handle_group;
+    SPItem *_last_over;
+    ShapeEditors _shape_editors;
 
     unsigned cursor_drag : 1;
+    unsigned show_handles : 1;
     unsigned show_outline : 1;
+    unsigned live_outline : 1;
+    unsigned live_objects : 1;
     unsigned show_path_direction : 1;
     unsigned show_transform_handles : 1;
     unsigned single_node_transform_handles : 1;
@@ -82,4 +92,4 @@ GType ink_node_tool_get_type (void);
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :