Properly revert FormatSpec changes on "cancel"

[ardour.git] / gtk2_ardour / control_point.h

diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h
index 013ba71e491efbaa0f5e02e226692122c8210e15..524398aa014ece481cf596e4ea0515d87cd9f90a 100644 (file)
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-2007 Paul Davis 
+    Copyright (C) 2002-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,11 +21,11 @@
 #define __ardour_control_point_h__
 
 #include <sys/types.h>
+#include <gdk/gdkevents.h>
 
-#include <ardour/automation_list.h>
+#include "ardour/automation_list.h"
 
-#include "canvas.h"
-#include "simplerect.h"
+#include "selectable.h"
 
 class AutomationLine;
 class ControlPoint;
@@ -35,16 +35,15 @@ class AutomationTimeAxisView;
 class Selectable;
 class Selection;
 
-namespace Gnome {
-       namespace Canvas {
-               class SimpleRect;
-               class Diamond;
-       }
+namespace ArdourCanvas {
+       class Rectangle;
+       class Diamond;
+       class Item;
 }
 
-class ControlPoint 
+class ControlPoint : public Selectable
 {
-  public:
+public:
        ControlPoint (AutomationLine& al);
        ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
        virtual ~ControlPoint ();
@@ -54,47 +53,48 @@ class ControlPoint
                Start,
                End
        };
-       
+
        void move_to (double x, double y, ShapeType);
        void reset (double x, double y, ARDOUR::AutomationList::iterator, uint32_t, ShapeType);
        double get_x() const { return _x; }
        double get_y() const { return _y; }
 
-       void hide (); 
+       void hide ();
        void show ();
-       void show_color (bool entered, bool hide_too);
+       bool visible () const;
+
+       double size () const {
+               return _size;
+       }
 
        void set_size (double);
-       void set_visible (bool);
+       void set_color ();
 
        bool     can_slide() const          { return _can_slide; }
        void     set_can_slide(bool yn)     { _can_slide = yn; }
-       bool     selected() const           { return _selected; }
-       void     set_selected(bool yn)      { _selected = yn; }
        uint32_t view_index() const         { return _view_index; }
        void     set_view_index(uint32_t i) { _view_index = i; }
-       
+
+       ArdourCanvas::Item& item() const;
+
        ARDOUR::AutomationList::iterator model() const { return _model; }
        AutomationLine&                  line()  const { return _line; }
-       ArdourCanvas::Item*              item()  const { return _item; }
-
-  protected:
-       ArdourCanvas::SimpleRect* _item;
 
-       AutomationLine& _line;
+       static PBD::Signal1<void, ControlPoint *> CatchDeletion;
 
+private:
+       ArdourCanvas::Rectangle*        _item;
+       AutomationLine&                  _line;
        ARDOUR::AutomationList::iterator _model;
-       uint32_t _view_index;
-       bool     _can_slide;
-       bool     _selected;
+       uint32_t                         _view_index;
+       bool                             _can_slide;
+       double                           _x;
+       double                           _y;
+       double                           _size;
+       ShapeType                        _shape;
 
        virtual bool event_handler (GdkEvent*);
 
-  private:
-       double    _x;
-       double    _y;
-       double    _size;
-       ShapeType _shape;
 };