major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI...

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

diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index ca1b88abba48cca8f9e2fc0c8ec4855b8a37ca8d..7f986e738cf6d6957dee006e81bcc39629019313 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -36,15 +36,31 @@ 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>&, 
+                                 bool set_size = false,
+                                 gint hpadding = 0, gint vpadding = 0);
+
+        // Combo's are stupid - they steal space from the entry for the button
+#ifdef GTKOSX
+        static const guint32 COMBO_FUDGE = 38; 
+#else
+        static const guint32 COMBO_FUDGE = 24; 
+#endif
+
        template<class T> void deferred_delete (void *ptr) {
                delete static_cast<T *> (ptr);
        }