A possible method for correctly sizing the editor controls, and a couple buttons...

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

diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 54b6c7d98735206ded80358181bb95a93a1d1464..d52ab42ee7a3f03b0a234b9da7f28b930ce55689 100644 (file)
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -18,24 +18,32 @@
     $Id$
 */
 
+#include <gtk/gtkpaned.h>
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/gtkutils.h>
+#include <gtkmm/widget.h>
+#include <gtkmm/window.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "i18n.h"
 
+using namespace std;
+
 void
 Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *text,
-                                           gint hpadding, gint vpadding)
+                                                  gint hpadding, gint vpadding)
 
 {
+       int height = 0;
+       int width = 0;
+
        w.ensure_style ();
-       set_size_request_to_display_given_text(w, text, hpadding, vpadding);
-}
+       w.create_pango_layout(text)->get_pixel_size (width, height);
 
-gint
-do_not_propagate (GdkEventButton *ev)
-{
-       return TRUE;
+       height += vpadding;
+       width += hpadding;
+
+       w.set_size_request(width, height);
 }
 
 void
@@ -45,3 +53,24 @@ Gtkmm2ext::init ()
        (void) bindtextdomain(PACKAGE, LOCALEDIR);
 }
 
+void
+Gtkmm2ext::set_popdown_strings (Gtk::ComboBoxText& cr, const vector<string>& strings)
+{
+       cr.clear ();
+
+       for (vector<string>::const_iterator i = strings.begin(); i != strings.end(); ++i) {
+               cr.append_text (*i);
+       }
+}
+
+GdkWindow*
+Gtkmm2ext::get_paned_handle (Gtk::Paned& paned)
+{
+       return GTK_PANED(paned.gobj())->handle;
+}
+
+void
+Gtkmm2ext::set_decoration (Gtk::Window* win, Gdk::WMDecoration decor)
+{
+       win->get_window()->set_decorations (decor);
+}