diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 16:51:02 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 16:51:02 +0000 |
| commit | da8eec7a8311295ee91308eca9fae2146385c512 (patch) | |
| tree | 8353f003e048b3980bdf4e09f78a4c37d3ad6a59 /gtk2_ardour/utils.cc | |
| parent | c1ee2c6943623e43181d56eed0de18b608fff86a (diff) | |
remove Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 8884e762da..5e0497460b 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -58,7 +58,7 @@ using Gtkmm2ext::Keyboard; sigc::signal<void> DPIReset; int -pixel_width (const ustring& str, Pango::FontDescription& font) +pixel_width (const string& str, Pango::FontDescription& font) { Label foo; Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (""); @@ -71,20 +71,20 @@ pixel_width (const ustring& str, Pango::FontDescription& font) return width; } -ustring -fit_to_pixels (const ustring& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses) +string +fit_to_pixels (const string& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses) { Label foo; Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout (""); - ustring::size_type shorter_by = 0; - ustring txt; + string::size_type shorter_by = 0; + string txt; layout->set_font_description (font); actual_width = 0; - ustring ustr = str; - ustring::iterator last = ustr.end(); + string ustr = str; + string::iterator last = ustr.end(); --last; /* now points at final entry */ txt = ustr; @@ -780,7 +780,7 @@ get_xpm (std::string name) return xpm_map[name]; } -Glib::ustring +std::string get_icon_path (const char* cname) { string name = cname; @@ -964,7 +964,7 @@ resize_window_to_proportion_of_monitor (Gtk::Window* window, int max_width, int } Glib::RefPtr<Gdk::Pixbuf> -pixbuf_from_ustring(const ustring& name, Pango::FontDescription* font, int clip_width, int clip_height, Gdk::Color fg) +pixbuf_from_string(const string& name, Pango::FontDescription* font, int clip_width, int clip_height, Gdk::Color fg) { static Glib::RefPtr<Gdk::Pixbuf>* empty_pixbuf = 0; |