1 files changed, 9 insertions, 2 deletions
diff --git a/SidebarToolbox.h b/SidebarToolbox.h
index 46af985..49bfec4 100644
--- a/SidebarToolbox.h
+++ b/SidebarToolbox.h
@@ -7,6 +7,7 @@
 #include "EditManager.h"
 #include "Sidebar.h"
 #include "Tool.h"
+#include "ToolSelector.h"
 
 class SidebarToolbox : Sidebar {
   private:
@@ -14,20 +15,26 @@ class SidebarToolbox : Sidebar {
     
     std::list<Tool*> tools;
     std::map<Tool*, GtkWidget*> buttons;
+    std::map<GtkWidget*, Tool*> buttonsRev;
+    
+    Tool *activeTool;
+    
+    ToolSelector toolSelector;
     
     int cols, rows;
     
     void updateRows(bool changed);
+    void activateTool(Tool *tool);
     
     // prevent shallow copy
     SidebarToolbox(const SidebarToolbox &w);
     const SidebarToolbox& operator=(const SidebarToolbox &w);
     
-    static void toolAction(GtkWidget *button, Tool *tool);
+    static void buttonToggled(GtkWidget *button, SidebarToolbox *toolbox);
     static void sizeAllocate(GtkWidget *widget, GtkAllocation *allocation, SidebarToolbox *toolbox);
     
   public:
-    SidebarToolbox();
+    SidebarToolbox(EditManager *editManager);
     virtual ~SidebarToolbox();
     
     GtkWidget* getWidget() {