Merged with trunk R1612.

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 53a0ee45531bf137942f15fbecb9d4746faa3f2d..a0267d7e862aca50fbbc52e45fd82f326feeb3c5 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -969,12 +968,10 @@ TimeAxisView::compute_controls_size_info ()
                buttons[i]->set_name ("TrackMuteButton");
        }
 
-       Gtk::Requisition req;
-
        one_row_table.attach (*buttons[0], 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
        
        one_row_table.show_all ();
-       one_row_table.size_request (req);
+       Gtk::Requisition req(one_row_table.size_request ());
 
 
        // height required to show 1 row of buttons
@@ -990,7 +987,7 @@ TimeAxisView::compute_controls_size_info ()
        two_row_table.attach (*buttons[4], 8, 9, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 
        two_row_table.show_all ();
-       two_row_table.size_request (req);
+       req = two_row_table.size_request ();
 
        // height required to show all normal buttons