X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Futils.h;h=b42371f4a2032854b53217023f4800ae236fce35;hb=d0227fe5b7c30271cd2950a71d429cf03b0db2db;hp=9ee66729fc5906191591e3e2cf9fb897d1bf9d71;hpb=43e8e880dc25a52b6a929b9c5eebfbe348c43e95;p=ardour.git

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 9ee66729fc..b42371f4a2 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -26,22 +26,29 @@
 #include "ardour/types.h"
 #include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
-#include <glibmm/ustring.h>
 #include <gtkmm/menushell.h>
 
 #include "canvas.h"
 
+namespace PBD {
+        class Controllable;
+        class ScopedConnectionList;
+}
+
 namespace Gtk {
 	class Window;
 	class ComboBoxText;
 	class Paned;
+        class Adjustment;
 }
 
-Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
+extern sigc::signal<void>  DPIReset;
+
+std::string fit_to_pixels (const std::string&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
 
 std::pair<std::string, double> fit_to_pixels (cairo_t *, std::string, double);
 
-int pixel_width (const Glib::ustring& str, Pango::FontDescription& font);
+int pixel_width (const std::string& str, Pango::FontDescription& font);
 
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
 void   allow_keyboard_focus (bool);
@@ -67,12 +74,11 @@ bool canvas_item_visible (ArdourCanvas::Item* item);
 void set_color (Gdk::Color&, int);
 
 bool relay_key_press (GdkEventKey* ev, Gtk::Window* win);
+bool forward_key_press (GdkEventKey* ev);
 bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
-bool possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval);
-uint32_t possibly_translate_legal_accelerator_to_real_key (uint32_t keyval);
 
 Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string);
-Glib::ustring get_icon_path (const char*);
+std::string get_icon_path (const char*);
 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);
@@ -81,18 +87,6 @@ bool key_is_legal_for_numeric_entry (guint keyval);
 void reset_dpi ();
 void set_pango_fontsize ();
 
-inline guint8 convert_color_channel (guint8 src, guint8 alpha);
-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,
-					       Pango::FontDescription* font,
-					       int clip_width,
-					       int clip_height,
-					       Gdk::Color);
-
 void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int);
 
 std::string escape_underscores (std::string const &);