initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 27 insertions, 0 deletions

diff --git a/libs/canvas/canvas/pixbuf.h b/libs/canvas/canvas/pixbuf.h
new file mode 100644
index 0000000000..31efb1c1ef
--- /dev/null
+++ b/libs/canvas/canvas/pixbuf.h
@@ -0,0 +1,27 @@
+#include <glibmm/refptr.h>
+
+#include "canvas/item.h"
+
+namespace Gdk {
+	class Pixbuf;
+}
+
+namespace ArdourCanvas {
+
+class Pixbuf : public Item
+{
+public:
+	Pixbuf (Group *);
+
+	void render (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
+	void compute_bounding_box () const;
+	XMLNode* get_state () const;
+	void set_state (XMLNode const *);
+
+	void set (Glib::RefPtr<Gdk::Pixbuf>);
+
+private:
+	Glib::RefPtr<Gdk::Pixbuf> _pixbuf;
+};
+
+}