a few more header files fixes, plus cleanup from nick_m, and the start of Action...

[ardour.git] / gtk2_ardour / imageframe_time_axis_group.cc

diff --git a/gtk2_ardour/imageframe_time_axis_group.cc b/gtk2_ardour/imageframe_time_axis_group.cc
index 1c6f670157fc0ed941ef68fb2859b3fbec928e47..fece74841748b76cf0844bed50583be4a306deda 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_group.cc
+++ b/gtk2_ardour/imageframe_time_axis_group.cc
@@ -166,7 +166,7 @@ ImageFrameTimeAxisGroup::set_item_samples_per_units(gdouble spp)
  * @param color the new base color
  */
 void
-ImageFrameTimeAxisGroup::apply_item_color(GdkColor& color)
+ImageFrameTimeAxisGroup::apply_item_color(Gdk::Color& color)
 {
        region_color = color ;
        for(ImageFrameViewList::const_iterator citer = imageframe_views.begin(); citer != imageframe_views.end(); citer++)
@@ -439,7 +439,7 @@ ImageFrameTimeAxisGroup::remove_this_group(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(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
+       Glib::signal_idle().connect(bind(ptr_fun(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
 }
 
 /**