From c38fdbc64c73c686f9f55729b352f8d0f4c09070 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 9 Oct 2005 05:03:29 +0000 Subject: "finalmunge" patch from nick, plus work on editor region list and actions infrastructure from me git-svn-id: svn://localhost/trunk/ardour2@52 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/time_axis_view_item.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/time_axis_view_item.cc') diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index c9fbe922d8..7f1bfc53e5 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -60,7 +60,7 @@ const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6 ; * @param start the start point of this item * @param duration the duration of this item */ -TimeAxisViewItem::TimeAxisViewItem(std::string it_name, GnomeCanvasGroup* parent, TimeAxisView& tv, double spu, GdkColor& base_color, +TimeAxisViewItem::TimeAxisViewItem(std::string it_name, GnomeCanvasGroup* parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, jack_nframes_t start, jack_nframes_t duration, Visibility visibility) : trackview (tv) @@ -557,7 +557,7 @@ TimeAxisViewItem::set_height(double height) * */ void -TimeAxisViewItem::set_color(GdkColor& base_color) +TimeAxisViewItem::set_color(Gdk::Color& base_color) { compute_colors (base_color); set_colors (); @@ -929,7 +929,7 @@ TimeAxisViewItem::remove_this_item(void* src) defer to idle loop, otherwise we'll delete this object while we're still inside this function ... */ - Gtk::Main::idle.connect(bind(mem_fun(&TimeAxisViewItem::idle_remove_this_item), this, src)); + Glib::signal_idle().connect(bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src)); } /** -- cgit v1.2.3