diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2005-11-13 03:53:51 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2005-11-13 03:53:51 +0000 |
| commit | 183f69970c6c436b102f8b2fbe1bc6070c9e9bfe (patch) | |
| tree | 9e0831557d8b096605d7c80b563fec755b5cbdf0 /gtk2_ardour/marker.h | |
| parent | 1a3a77607768721f6834ddae09f532cdb6aec4a6 (diff) | |
some C++-ification of GnomeCanvasBlah
git-svn-id: svn://localhost/trunk/ardour2@82 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 77d2976dd1..6595289901 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -24,7 +24,8 @@ #include <string> #include <glib.h> #include <ardour/ardour.h> -#include <libgnomecanvas/libgnomecanvas.h> +#include <libgnomecanvasmm/libgnomecanvasmm.h> +#include <libgnomecanvasmm/polygon.h> #include <sigc++/signal.h> namespace ARDOUR { @@ -49,8 +50,8 @@ class Marker : public sigc::trackable PunchOut }; - Marker (PublicEditor& editor, GnomeCanvasGroup *parent, guint32 rgba, const string& text, Type, - gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer), jack_nframes_t frame = 0); + Marker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, Type, + gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer), jack_nframes_t frame = 0); virtual ~Marker (); void set_position (jack_nframes_t); @@ -65,10 +66,10 @@ class Marker : public sigc::trackable protected: PublicEditor& editor; - GnomeCanvasItem *group; - GnomeCanvasItem *mark; - GnomeCanvasItem *text; - GnomeCanvasPoints *points; + Gnome::Canvas::Group *group; + Gnome::Canvas::Item *mark; + Gnome::Canvas::Text *text; + Gnome::Canvas::Points *points; double unit_position; jack_nframes_t frame_position; @@ -81,8 +82,8 @@ class Marker : public sigc::trackable class TempoMarker : public Marker { public: - TempoMarker (PublicEditor& editor, GnomeCanvasGroup *parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, - gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer)); + TempoMarker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, + gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer)); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -94,8 +95,8 @@ class TempoMarker : public Marker class MeterMarker : public Marker { public: - MeterMarker (PublicEditor& editor, GnomeCanvasGroup *parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, - gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer)); + MeterMarker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, + gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer)); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |