Use modern noncopyable pattern

2 files changed, 14 insertions, 4 deletions

diff --git a/ganv/Canvas.hpp b/ganv/Canvas.hpp
index eaf08fd..a862ae3 100644
--- a/ganv/Canvas.hpp
+++ b/ganv/Canvas.hpp
@@ -52,7 +52,14 @@ class Canvas
 {
 public:
 	Canvas(double width, double height);
-	virtual	~Canvas();
+
+	Canvas(const Canvas&) = delete;
+	Canvas& operator=(const Canvas&) = delete;
+
+	Canvas(Canvas&&)  = delete;
+	Canvas& operator=(Canvas&&) = delete;
+
+	virtual ~Canvas();
 
 	GanvItem* root() { return ganv_canvas_root(gobj()); }
 
@@ -138,9 +145,6 @@ public:
 	sigc::signal<void, Node*, Node*> signal_disconnect;
 
 private:
-	Canvas(const Canvas&);  ///< Noncopyable
-	const Canvas& operator=(const Canvas&);  ///< Noncopyable
-
 	GanvCanvas* const _gobj;
 };
 
diff --git a/ganv/Item.hpp b/ganv/Item.hpp
index fcb98ef..8f0f9c2 100644
--- a/ganv/Item.hpp
+++ b/ganv/Item.hpp
@@ -47,6 +47,12 @@ public:
 		}
 	}
 
+	Item(const Item&) = delete;
+	Item& operator=(const Item&) = delete;
+
+	Item(Item&&)  = delete;
+	Item& operator=(Item&&) = delete;
+
 	virtual ~Item() {
 		gtk_object_destroy(GTK_OBJECT(_gobj));
 	}