summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker_time_axis_view.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-10-05 13:48:09 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-10-05 13:48:09 +0000
commit60f817b0d2411947c257ecbf0b0376589ea77acd (patch)
tree62d26d36bde53e99fa3e68926dd9176a68b1e14f /gtk2_ardour/marker_time_axis_view.h
parentf5091b8db024c3499c72cac8694cde678e8f73bb (diff)
2 cleanup patches from nickm, plus work on mixer_ui.cc so that it compiles
git-svn-id: svn://localhost/trunk/ardour2@47 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker_time_axis_view.h')
-rw-r--r--gtk2_ardour/marker_time_axis_view.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h
index f611a38f2e..633bcd559c 100644
--- a/gtk2_ardour/marker_time_axis_view.h
+++ b/gtk2_ardour/marker_time_axis_view.h
@@ -114,7 +114,7 @@ class MarkerTimeAxisView : public sigc::trackable
*
* @param color the new base color
*/
- void apply_color(GdkColor& color) ;
+ void apply_color(Gdk::Color& color) ;
//---------------------------------------------------------------------------------------//
// Child MarkerView Accessors/Mutators
@@ -231,7 +231,7 @@ class MarkerTimeAxisView : public sigc::trackable
double _samples_per_unit;
/* XXX why are these different? */
- GdkColor region_color;
+ Gdk::Color region_color;
uint32_t stream_base_color;
}; /* class MarkerTimeAxisView */