1 files changed, 22 insertions, 4 deletions
diff --git a/src/desktop.h b/src/desktop.h
index 9a3c609d0..938c2153a 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -41,9 +41,9 @@ class SPCSSAttr;
 struct SPCanvas;
 struct SPCanvasItem;
 struct SPCanvasGroup;
-struct SPEventContext;
+class SPEventContext;
 class  SPItem;
-struct SPNamedView;
+class SPNamedView;
 class  SPObject;
 struct SPStyle;
 typedef struct _DocumentInterface DocumentInterface;//struct DocumentInterface;
@@ -135,6 +135,21 @@ public:
     Inkscape::Display::TemporaryItemList *temporary_item_list;
     Inkscape::Display::SnapIndicator *snapindicator;
 
+    SPEventContext* getEventContext() const;
+    Inkscape::Selection* getSelection() const;
+    SPDocument* getDocument() const;
+    SPCanvas* getCanvas() const;
+    SPCanvasItem* getAcetate() const;
+    SPCanvasGroup* getMain() const;
+    SPCanvasGroup* getGridGroup() const;
+    SPCanvasGroup* getGuides() const;
+    SPCanvasItem* getDrawing() const;
+    SPCanvasGroup* getSketch() const;
+    SPCanvasGroup* getControls() const;
+    SPCanvasGroup* getTempGroup() const;
+    Inkscape::MessageStack* getMessageStack() const;
+    SPNamedView* getNamedView() const;
+
     SPCanvasItem  *acetate;
     SPCanvasGroup *main;
     SPCanvasGroup *gridgroup;
@@ -279,8 +294,11 @@ public:
     void activate_guides (bool activate);
     void change_document (SPDocument *document);
 
-    void set_event_context (GType type, const gchar *config);
-    void push_event_context (GType type, const gchar *config, unsigned int key);
+
+    void set_event_context2(const std::string& toolName);
+
+    //void set_event_context (GType type, const gchar *config);
+    //void push_event_context (GType type, const gchar *config, unsigned int key);
 
     void set_coordinate_status (Geom::Point p);
     SPItem *getItemFromListAtPointBottom(const GSList *list, Geom::Point const p) const;