From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 9 Jul 2014 20:47:42 +0000 (-0400)
Subject: add std::string variant of set_size_request_to_display_given_string()
X-Git-Tag: 4.0-rc1~1601^2~557
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=b9c53ea3950d0cfead30df5ad778923620b5eb8b;p=ardour.git

add std::string variant of set_size_request_to_display_given_string()
---

diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index 1e36868814..bad9ca75d6 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -65,11 +65,16 @@ namespace Gtkmm2ext {
 								      gint hpadding,
 								      gint vpadding);
 	
+	LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w,
+								      std::string const & text,
+								      gint hpadding,
+								      gint vpadding);
 	LIBGTKMM2EXT_API void set_size_request_to_display_given_text (Gtk::Widget &w,
 								      const std::vector<std::string>&,
 								      gint hpadding,
 								      gint vpadding);
 
+
 	LIBGTKMM2EXT_API Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_string (const std::string& name, 
 								       const Pango::FontDescription& font, 
 								       int clip_width, 
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index d3a593a68f..37ed4ba66b 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -76,6 +76,17 @@ Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, const gchar *
 	w.set_size_request(width + hpadding, height + vpadding);
 }
 
+void
+Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, std::string const & text,
+						   gint hpadding, gint vpadding)
+{
+	int width, height;
+	w.ensure_style ();
+	
+	get_pixel_size (w.create_pango_layout (text), width, height);
+	w.set_size_request(width + hpadding, height + vpadding);
+}
+
 void
 Gtkmm2ext::set_size_request_to_display_given_text (Gtk::Widget &w, 
 						   const std::vector<std::string>& strings,