diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-17 14:14:26 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-17 14:14:26 +0000 |
| commit | 1474b10d39873538f93a466517f518c5013d1ac3 (patch) | |
| tree | 0c6d2b8bcf4673c68152ba83622e75c0ff252fe4 /gtk2_ardour | |
| parent | 29d677e6681b02d6940346ac88a432558b6c2a43 (diff) | |
avoid .h pollution in last commit
git-svn-id: svn://localhost/ardour2/branches/3.0@6110 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor.h | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 3 |
5 files changed, 8 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 8ec20014b5..d96ccdcf4b 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -81,6 +81,7 @@ #include "audio_time_axis.h" #include "utils.h" #include "crossfade_view.h" +#include "canvas-noevent-text.h" #include "editing.h" #include "public_editor.h" #include "crossfade_edit.h" diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 0f5b2f3edd..ca60eb7dac 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -61,11 +61,14 @@ #include "editing.h" #include "enums.h" #include "editor_items.h" -#include "canvas-noevent-text.h" #include "region_selection.h" #include "canvas.h" #include "editor_summary.h" +namespace Gnome { namespace Canvas { + class NoEventText; +} } + namespace Gtkmm2ext { class TearOff; } diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index f3a59f2c57..86d6256f1f 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -36,6 +36,7 @@ #include "simpleline_p.h" #include "imageframe_p.h" #include "canvas_impl.h" +#include "canvas-noevent-text.h" #include "editing.h" #include "rgb_macros.h" #include "utils.h" diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index c176652547..525abf8d00 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -35,6 +35,7 @@ #include "public_editor.h" #include "audio_region_view.h" #include "audio_streamview.h" +#include "canvas-noevent-text.h" #include "crossfade_view.h" #include "audio_time_axis.h" #include "region_gain_line.h" diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 4ac5cf6989..5210515541 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1961,8 +1961,7 @@ Editor::show_verbose_time_cursor (nframes64_t frame, double offset, double xpos, if (xpos >= 0 && ypos >=0) { set_verbose_canvas_cursor (buf, xpos + offset, ypos + offset); - } - else { + } else { set_verbose_canvas_cursor (buf, _drag->current_pointer_x() + offset - horizontal_adjustment.get_value(), _drag->current_pointer_y() + offset - vertical_adjustment.get_value() + canvas_timebars_vsize); } show_verbose_canvas_cursor (); |