--- a/doodle/main/prog/doodler.d	Tue Aug 10 22:55:54 2010 +0930
+++ b/doodle/main/prog/doodler.d	Wed Aug 11 15:07:58 2010 +0930
@@ -12,7 +12,7 @@
     import doodle.fig.tools;
 
     import doodle.gtk.canvas;
-    import doodle.gtk.palette2;
+    import doodle.gtk.palette;
 
     import gtk.Main;
     import gtk.MainWindow;
@@ -27,7 +27,7 @@
         auto window = new MainWindow("Doodle");
         auto vbox = new VBox(false, 0);
 
-        auto palette = new Palette2!Tool;
+        auto palette = new Palette!Tool;
         _palette = palette;
 
         vbox.packStart(palette, false, false, 0);
@@ -52,14 +52,14 @@
 
         vbox.packStart(canvas, true, true, 0);
 
-        Palette2!Tool.Item[] items = [
+        Palette!Tool.Item[] items = [
         { "select.svg",    "Select",    "Select and modify elements", new SelectTool },
         { "rectangle.svg", "Rectangle", "Create rectangle", new CreateRectangleTool(_diagram) },
         { "ellipse.svg",   "Ellipse",   "Create ellipse", new CreateRectangleTool(_diagram) },
         { "polyline.svg",  "Polyline",  "Create polyline", new CreateRectangleTool(_diagram) }
         ];
 
-        palette.configure(items, &paletteCallback);
+        palette.configure(items, &_toolStack.use);
         window.add(vbox);
         window.setDefaultSize(640, 580);
         window.showAll();
@@ -73,13 +73,8 @@
 
     private {
         IToolStack _toolStack;
-        Palette2!Tool _palette;     // FIXME refer to the interface?
+        IPalette!Tool _palette;
         IDiagram _diagram;
-
-        void paletteCallback(Tool tool) {
-            _toolStack.use(tool);
-        }
-
     }
 }