stop using gkd_pango_context_get() in ArdourCanvas::Canvas and require concrete instances to supply a Pango::Context; do this for GtkCanvas and Push2Canvas

1 files changed, 10 insertions, 2 deletions

diff --git a/libs/canvas/canvas/canvas.h b/libs/canvas/canvas/canvas.h
index b818c7eb41..7731b8533b 100644
--- a/libs/canvas/canvas/canvas.h
+++ b/libs/canvas/canvas/canvas.h
@@ -43,6 +43,10 @@ namespace Gtk {
 	class Label;
 }
 
+namespace Pango {
+	class Context;
+}
+
 namespace ArdourCanvas
 {
 struct Rect;
@@ -154,7 +158,9 @@ public:
 	 */
 	static void set_tooltip_timeout (uint32_t msecs);
 
-protected:
+	virtual Glib::RefPtr<Pango::Context> get_pango_context() = 0;
+
+  protected:
 	Root  _root;
         Color _bg_color;
 
@@ -195,7 +201,9 @@ public:
 	void start_tooltip_timeout (Item*);
 	void stop_tooltip_timeout ();
 
-protected:
+	Glib::RefPtr<Pango::Context> get_pango_context();
+
+  protected:
 	void on_size_allocate (Gtk::Allocation&);
 	bool on_scroll_event (GdkEventScroll *);
 	bool on_expose_event (GdkEventExpose *);