Merged with trunk R1311.

[ardour.git] / gtk2_ardour / utils.h

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 983753a0ddb5a982c965d7e416e888f78c1e3d1f..6d5ff0702d8b7443577a6cb30ac58ea6db0894a1 100644 (file)
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -23,9 +23,12 @@
 
 #include <string>
 #include <cmath>
+#include <vector>
 #include <ardour/types.h>
 #include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
+#include <glibmm/ustring.h>
+
 #include "canvas.h"
 
 namespace Gtk {
@@ -50,12 +53,8 @@ slider_position_to_gain (double pos)
        return pow (2.0,(sqrt(sqrt(sqrt(pos)))*198.0-192.0)/6.0);
 }
 
-std::string short_version (std::string, std::string::size_type target_length);
-std::string fit_to_pixels (const std::string &, int pixel_width, const std::string & font);
+Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
 
-int    atoi (const std::string&);
-double atof (const std::string&);
-void   url_decode (std::string&);
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
 void   allow_keyboard_focus (bool);
 
@@ -66,7 +65,6 @@ ArdourCanvas::Points* get_canvas_points (std::string who, uint32_t npoints);
 
 Pango::FontDescription get_font_for_style (std::string widgetname);
 
-gint pane_handler (GdkEventButton*, Gtk::Paned*);
 uint32_t rgba_from_style (std::string, uint32_t, uint32_t, uint32_t, uint32_t, std::string = "fg", int = Gtk::STATE_NORMAL, bool = true);
 
 void decorate (Gtk::Window& w, Gdk::WMDecoration d);
@@ -77,8 +75,11 @@ void set_color (Gdk::Color&, int);
 
 bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
 
-Glib::RefPtr<Gdk::Pixbuf> get_xpm(std::string);
+Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string);
+Glib::RefPtr<Gdk::Pixbuf> get_icon (const char*);
 static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map;
 const char* const *get_xpm_data (std::string path);
+std::string longest (std::vector<std::string>&);
+bool key_is_legal_for_numeric_entry (guint keyval);
 
 #endif /* __ardour_gtk_utils_h__ */