fix lack of canvas.h

[ardour.git] / gtk2_ardour / utils.h

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 7596b2619014d5352fb3db18cedf2337a4d32548..cdb9e13251b4085ef43b7ba356f76789b51f847f 100644 (file)
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -25,12 +25,12 @@
 #include <vector>
 #include <cmath>
 #include <ardour/types.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <libgnomecanvasmm/line.h>
 #include <gdkmm/types.h>
 
 namespace Gtk {
        class Window;
-       class Combo;
+       class ComboBoxText;
        class Paned;
 }
 
@@ -51,7 +51,7 @@ 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, int32_t pixel_width, Gdk_Font&);
+std::string fit_to_pixels (std::string, int pixel_width, std::string font);
 
 int    atoi (const std::string&);
 double atof (const std::string&);
@@ -65,10 +65,12 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);
 
 GnomeCanvasPoints* get_canvas_points (std::string who, uint32_t npoints);
 
-int channel_combo_get_channel_count (Gtk::Combo& combo);
-std::string get_font_for_style (std::string widgetname);
+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);
 
+void decorate (Gtk::Window& w, Gdk::WMDecoration d);
+
 #endif /* __ardour_gtk_utils_h__ */