make X on track hide button visible; fix signed/unsigned warning

git-svn-id: svn://localhost/ardour2/trunk@1109 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 7fc0bc792654b6d15b71fbdc8482bcf6c5199841..b7846dd79a03af3e9c45dd092b40277701a1f0a7 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -749,7 +749,7 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
                if (view_index && pi != npoints && /* not the first, not the last */
                    (((this_rx == prev_rx) && (this_ry == prev_ry)) || /* same point */
                     (((this_rx - prev_rx) < (box_size + 2)) &&  /* too close horizontally */
-                     ((abs ((int)(this_ry - prev_ry)) < (box_size + 2)))))) { /* too close vertically */
+                     ((abs ((int)(this_ry - prev_ry)) < (int) (box_size + 2)))))) { /* too close vertically */
                        continue;
                }
 

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index da0c22b015f74a4c1dedc1d7cb47389daec65821..d41ad5defbfb4fbdcd8f832d9ce342da98d474c5 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -115,6 +115,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        hide_button.set_name ("TrackRemoveButton");
 
        hide_button.add (*(manage (new Image (get_xpm("small_x.xpm")))));
+       hide_button.show_all ();
 
        edit_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false);
        playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click));