diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-08-18 17:35:34 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-08-18 17:35:34 +0000 |
| commit | e626152a22232895357a5e1381e3d49af7b130d5 (patch) | |
| tree | 26e2c191c936ecb8eb9aabed3434379733daf217 /gtk2_ardour/utils.h | |
| parent | 115934e6abfa124d1e93ecb7c212083a1b255fae (diff) | |
remove use of Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10006 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.h')
| -rw-r--r-- | gtk2_ardour/utils.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 61d5f4f0f6..8b2fa18591 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -26,7 +26,6 @@ #include <ardour/types.h> #include <libgnomecanvasmm/line.h> #include <gdkmm/types.h> -#include <glibmm/ustring.h> #include "canvas.h" #include "public_editor.h" @@ -53,8 +52,8 @@ slider_position_to_gain (double pos) return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0); } -Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false); -int pixel_width (const Glib::ustring& str, Pango::FontDescription& font); +std::string fit_to_pixels (const std::string&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false); +int pixel_width (const std::string& str, Pango::FontDescription& font); gint just_hide_it (GdkEventAny*, Gtk::Window*); void allow_keyboard_focus (bool); @@ -94,7 +93,7 @@ void convert_bgra_to_rgba (guint8 const* src, guint8* dst, int width, int height); -Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_ustring (const Glib::ustring& name, +Glib::RefPtr<Gdk::Pixbuf> pixbuf_from_string (const std::string& name, Pango::FontDescription* font, uint32_t rgba, int clip_width, |