From b62c348c88f4c34286a759898e7148561c3de35e Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Sun, 5 Mar 2006 10:24:31 +0000 Subject: [PATCH] another get_vbox() fix, this time for PortSelectorWindow git-svn-id: svn://localhost/trunk/ardour2@346 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour2_ui.rc | 8 ++++---- gtk2_ardour/io_selector.cc | 6 ++---- gtk2_ardour/redirect_box.cc | 2 +- gtk2_ardour/sfdb_ui.cc | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc index 8df3dcca46..e5199db640 100644 --- a/gtk2_ardour/ardour2_ui.rc +++ b/gtk2_ardour/ardour2_ui.rc @@ -140,7 +140,7 @@ style "default_buttons_menus" style "very_small_button" = "default_buttons_menus" { - font_name = "sans 7" + font_name = "sans 6" } style "small_button" = "default_buttons_menus" @@ -173,7 +173,7 @@ style "track_rec_enable_button" = "small_button" style "mixer_rec_enable_button" = "track_rec_enable_button" { - font_name = "sans 7" + font_name = "sans 6" } style "solo_button" = "small_button" @@ -187,7 +187,7 @@ style "solo_button" = "small_button" style "mixer_solo_button" = "solo_button" { - font_name = "sans 7" + font_name = "sans 6" } @@ -201,7 +201,7 @@ style "mute_button" = "small_button" style "mixer_mute_button" = "mute_button" { - font_name = "sans 7" + font_name = "sans 6" } style "track_loop_button" = "small_button" diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 5354825c06..1f7c7dc045 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -821,10 +821,8 @@ PortInsertWindow::PortInsertWindow (Session& sess, PortInsert& pi, bool can_canc } button_box.pack_start (ok_button); - vbox.pack_start (_portinsertui); - vbox.pack_start (button_box, false, false); - - add (vbox); + get_vbox()->pack_start (_portinsertui); + get_vbox()->pack_start (button_box, false, false); ok_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::accept)); cancel_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::cancel)); diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index 1d0ed0507a..0936ff378b 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -108,7 +108,7 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec redirect_display.set_name ("RedirectSelector"); redirect_display.set_headers_visible (false); redirect_display.set_reorderable (true); - redirect_display.set_size_request (-1, 48); + redirect_display.set_size_request (-1, -1); redirect_display.get_column(0)->set_sizing(TREE_VIEW_COLUMN_FIXED); redirect_display.get_column(0)->set_fixed_width(48); redirect_display.add_object_drag (columns.redirect.index(), "redirects"); diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 0ad46946bf..8fb849e3a7 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -23,6 +23,7 @@ #include #include +#include #include