diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
commit | aaea166135ace01709f7e0be64f40be80f4107ec (patch) | |
tree | 0e794ef7a723e4aaf909b841a6816e405b4ceca1 /gtk2_ardour/control_point.h | |
parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/control_point.h')
-rw-r--r-- | gtk2_ardour/control_point.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h index 0c2bf1e01d..1a7a1f22b8 100644 --- a/gtk2_ardour/control_point.h +++ b/gtk2_ardour/control_point.h @@ -21,11 +21,10 @@ #define __ardour_control_point_h__ #include <sys/types.h> +#include <gdk/gdkevents.h> #include "ardour/automation_list.h" -#include "canvas.h" -#include "simplerect.h" #include "selectable.h" class AutomationLine; @@ -36,11 +35,9 @@ class AutomationTimeAxisView; class Selectable; class Selection; -namespace Gnome { - namespace Canvas { - class SimpleRect; - class Diamond; - } +namespace ArdourCanvas { + class Rectangle; + class Diamond; } class ControlPoint : public Selectable @@ -86,7 +83,7 @@ class ControlPoint : public Selectable static PBD::Signal1<void, ControlPoint *> CatchDeletion; private: - ArdourCanvas::SimpleRect* _item; + ArdourCanvas::Rectangle* _item; AutomationLine& _line; ARDOUR::AutomationList::iterator _model; uint32_t _view_index; |