fix duplicate, and clarify its behaviour in smart mode; includes a fix for TimeSelect...

[ardour.git] / gtk2_ardour / utils.h

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index fbfba08a773054ec39813f7f66df1535c7119510..7137f273c65752d44aa6513313be41ea89d679e6 100644 (file)
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -42,14 +42,9 @@ namespace Gtk {
         class Adjustment;
 }
 
-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 std::string& str, Pango::FontDescription& font);
+extern sigc::signal<void>  DPIReset;
 
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
-void   allow_keyboard_focus (bool);
 void add_item_with_sensitivity (Gtk::Menu_Helpers::MenuList &, Gtk::Menu_Helpers::MenuElem, bool);
 
 unsigned char* xpm2rgb  (const char** xpm, uint32_t& w, uint32_t& h);
@@ -57,14 +52,10 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);
 
 ArdourCanvas::Points* get_canvas_points (std::string who, uint32_t npoints);
 
-Pango::FontDescription* get_font_for_style (std::string widgetname);
+Pango::FontDescription get_font_for_style (std::string widgetname);
 
 uint32_t rgba_from_style (std::string, uint32_t, uint32_t, uint32_t, uint32_t, std::string = "fg", int = Gtk::STATE_NORMAL, bool = true);
 
-Gdk::Color color_from_style (std::string widget_style_name, int state, std::string attr);
-Glib::RefPtr<Gdk::GC> gc_from_style (std::string widget_style_name, int state, std::string attr);
-
-
 void decorate (Gtk::Window& w, Gdk::WMDecoration d);
 
 bool canvas_item_visible (ArdourCanvas::Item* item);
@@ -88,7 +79,8 @@ void set_pango_fontsize ();
 void resize_window_to_proportion_of_monitor (Gtk::Window*, int, int);
 
 std::string escape_underscores (std::string const &);
+std::string escape_angled_brackets (std::string const &);
 
-void control_link (PBD::ScopedConnectionList& scl, boost::shared_ptr<PBD::Controllable> c, Gtk::Adjustment& a);
+Gdk::Color unique_random_color (std::list<Gdk::Color> &);
 
 #endif /* __ardour_gtk_utils_h__ */