From e70249ab658ef1b02da01d84bf2d9b46847e5194 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 23 Nov 2011 08:35:41 +0000 Subject: Pack toolbar combo boxes with expand=false and remove size kludges. Turns out gtk these days sizes combo boxes with precisely enough space if packed to not expand, none of this mess is necessary any more. git-svn-id: svn://localhost/ardour2/branches/3.0@10790 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/gtkmm2ext/utils.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'libs/gtkmm2ext/utils.cc') diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index ff5e5d8a9c..d9e1d15e9f 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -63,7 +63,6 @@ get_pixel_size (Glib::RefPtr layout, void Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text, gint hpadding, gint vpadding) - { int width, height; w.ensure_style (); @@ -76,7 +75,6 @@ void Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const std::vector& strings, gint hpadding, gint vpadding) - { int width, height; int width_max = 0; @@ -220,16 +218,12 @@ Gtkmm2ext::pixbuf_from_string(const string& name, const Pango::FontDescription& } void -Gtkmm2ext::set_popdown_strings (Gtk::ComboBoxText& cr, const vector& strings, bool set_size, gint hpadding, gint vpadding) +Gtkmm2ext::set_popdown_strings (Gtk::ComboBoxText& cr, const vector& strings) { vector::const_iterator i; cr.clear (); - if (set_size) { - set_size_request_to_display_given_text (cr, strings, COMBO_FUDGE+10+hpadding, 15+vpadding); - } - for (i = strings.begin(); i != strings.end(); ++i) { cr.append_text (*i); } -- cgit v1.2.3