X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.h;h=001da84a891f2bb9743f3d3553cff6cee7ddbf03;hb=b59fab7e533ef96d72c92b224d4f24718bc6b0a1;hp=19db87985780223df3a85b51e6f1b5eae77aac72;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git

diff --git a/source/widget.h b/source/widget.h
index 19db879..001da84 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -2,6 +2,7 @@
 #define MSP_GLTK_WIDGET_H_
 
 #include <string>
+#include <msp/core/noncopyable.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/gl/renderer.h>
 #include "geometry.h"
@@ -21,7 +22,7 @@ class Style;
 /**
 Base class for all widgets.
 */
-class MSPGLTK_API Widget
+class MSPGLTK_API Widget: public NonCopyable
 {
 	friend class Container;
 
@@ -30,6 +31,7 @@ public:
 	{
 	public:
 		Loader(Widget &);
+
 	private:
 		void position(int, int);
 		void size(unsigned, unsigned);
@@ -47,20 +49,17 @@ public:
 protected:
 	Geometry geom;
 	std::string style_name;
-	const Style *style;
-	State state;
-	bool visible;
-	InputType input_type;
-	Container *parent;
+	const Style *style = nullptr;
+	State state = NORMAL;
+	bool visible = true;
+	InputType input_type = INPUT_NONE;
+	Container *parent = nullptr;
 	std::string tooltip;
 	PartCache part_cache;
-	bool rebuild_needed;
+	bool rebuild_needed = false;
 	Time::TimeDelta anim_interval;
 
-	Widget();
-private:
-	Widget(const Widget &);
-	Widget &operator=(const Widget &);
+	Widget() = default;
 public:
 	virtual ~Widget();