new mix group interface, not yet finished and still to propagate to edit_group

[ardour.git] / gtk2_ardour / utils.h

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 8463b67bb39fef3ac43b61e72d241c16e7591daa..68cd16c779174857f2ce14f29711b7b9d0d8437a 100644 (file)
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -22,12 +22,12 @@
 #define __ardour_gtk_utils_h__
 
 #include <string>
-#include <vector>
 #include <cmath>
 #include <ardour/types.h>
 #include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
 #include "canvas.h"
+
 namespace Gtk {
        class Window;
        class ComboBoxText;
@@ -51,11 +51,10 @@ slider_position_to_gain (double pos)
 }
 
 std::string short_version (std::string, std::string::size_type target_length);
-std::string fit_to_pixels (std::string, int pixel_width, std::string font);
+std::string fit_to_pixels (const std::string &, int pixel_width, const std::string & font);
 
 int    atoi (const std::string&);
 double atof (const std::string&);
-void   strip_whitespace_edges (std::string& str);
 void   url_decode (std::string&);
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
 void   allow_keyboard_focus (bool);
@@ -65,12 +64,17 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);
 
 ArdourCanvas::Points* get_canvas_points (std::string who, uint32_t npoints);
 
-int channel_combo_get_channel_count (Gtk::ComboBoxText& combo);
 Pango::FontDescription get_font_for_style (std::string widgetname);
 
 gint pane_handler (GdkEventButton*, Gtk::Paned*);
-uint32_t rgba_from_style (std::string style, uint32_t, uint32_t, uint32_t, uint32_t);
+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);
 
+bool canvas_item_visible (ArdourCanvas::Item* item);
+
+void set_color (Gdk::Color&, int);
+
+bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
+
 #endif /* __ardour_gtk_utils_h__ */