From 9c715e49261c2ab333bb022ffa2f8d41fcd882eb Mon Sep 17 00:00:00 2001
From: Valeriy Kamyshniy <vkamyshniy@wavesglobal.com>
Date: Tue, 27 May 2014 22:57:33 -0400
Subject: [PATCH] [P4/git history rebuild] reversion of FastMeter away from
 CairoWidget. Probably needs reversion in a future merge with Ardour

---
 libs/gtkmm2ext/gtkmm2ext/fastmeter.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
index 650908f6a4..6802481777 100644
--- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
+++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
@@ -24,13 +24,14 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
 #include <cairomm/pattern.h>
-#include "gtkmm2ext/cairo_widget.h"
+#include <gtkmm/drawingarea.h>
+#include <gdkmm/pixbuf.h>
 
 #include "gtkmm2ext/visibility.h"
 
 namespace Gtkmm2ext {
 
-class LIBGTKMM2EXT_API FastMeter : public CairoWidget {
+class LIBGTKMM2EXT_API FastMeter : public Gtk::DrawingArea {
   public:
 	enum Orientation {
 		Horizontal,
@@ -66,7 +67,7 @@ class LIBGTKMM2EXT_API FastMeter : public CairoWidget {
 	bool get_highlight () { return highlight; }
 
 protected:
-	void render (cairo_t *, cairo_rectangle_t*);
+	bool on_expose_event (GdkEventExpose*);
 	void on_size_request (GtkRequisition*);
 	void on_size_allocate (Gtk::Allocation&);
 private:
@@ -95,12 +96,12 @@ private:
 	float current_user_level;
 	bool highlight;
 
-	void vertical_expose (cairo_t*, cairo_rectangle_t*);
+	bool vertical_expose (GdkEventExpose*);
 	void vertical_size_request (GtkRequisition*);
 	void vertical_size_allocate (Gtk::Allocation&);
 	void queue_vertical_redraw (const Glib::RefPtr<Gdk::Window>&, float);
 
-	void horizontal_expose (cairo_t*, cairo_rectangle_t*);
+	bool horizontal_expose (GdkEventExpose*);
 	void horizontal_size_request (GtkRequisition*);
 	void horizontal_size_allocate (Gtk::Allocation&);
 	void queue_horizontal_redraw (const Glib::RefPtr<Gdk::Window>&, float);