From 1552547f650a82487ac72615c8533fd25b4ffc39 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 13 Oct 2016 17:11:38 -0400 Subject: stop using gkd_pango_context_get() in ArdourCanvas::Canvas and require concrete instances to supply a Pango::Context; do this for GtkCanvas and Push2Canvas --- libs/canvas/canvas/canvas.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'libs/canvas/canvas') 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 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 get_pango_context(); + + protected: void on_size_allocate (Gtk::Allocation&); bool on_scroll_event (GdkEventScroll *); bool on_expose_event (GdkEventExpose *); -- cgit v1.2.3