combobox width fixes from mtaht, backported from 2.X

[ardour.git] / libs / gtkmm2ext / gtkmm2ext / utils.h

diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index 97dab523aab59d12481ba1cc0a18a801e3d66d21..e664f2420ddb84898fdf8f805e3907d3ebbad902 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -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$
 */
 
 #ifndef __gtkmm2ext_utils_h__
@@ -37,15 +36,22 @@ namespace Gtk {
 namespace Gtkmm2ext {
        void init ();
 
-       void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, int& width, int& height);
+       void get_ink_pixel_size (Glib::RefPtr<Pango::Layout>, 
+                                int& width, int& height);
 
        void set_size_request_to_display_given_text (Gtk::Widget &w,
                                                     const gchar *text,
                                                     gint hpadding,
                                                     gint vpadding);
 
-       void set_popdown_strings (Gtk::ComboBoxText&, const std::vector<std::string>&);
-       
+       void set_size_request_to_display_given_text (Gtk::Widget &w,
+                                       const std::vector<std::string>&,
+                                                    gint hpadding,
+                                                    gint vpadding);
+
+       void set_popdown_strings (Gtk::ComboBoxText&, 
+                                       const std::vector<std::string>&);
+
        template<class T> void deferred_delete (void *ptr) {
                delete static_cast<T *> (ptr);
        }