X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farrangement.h;h=4a651bac864a189cbb8c2942e35390939c2bff38;hb=6d9570c97584758e3cfcac6827d439b7fb844cf4;hp=31001c4d081686e8932e68acf541f1a0b6fb957e;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git diff --git a/source/arrangement.h b/source/arrangement.h index 31001c4..4a651ba 100644 --- a/source/arrangement.h +++ b/source/arrangement.h @@ -3,6 +3,7 @@ #include #include +#include #include "layout.h" #include "mspgltk_api.h" @@ -15,10 +16,9 @@ class MSPGLTK_API arrangement_error: public std::logic_error { public: arrangement_error(const std::string &w): std::logic_error(w) { } - virtual ~arrangement_error() throw() { } }; -class MSPGLTK_API Arrangement +class MSPGLTK_API Arrangement: public NonCopyable { protected: enum Side @@ -32,9 +32,7 @@ protected: struct Edge { std::list widgets; - bool aligned; - - Edge(); + bool aligned = false; bool empty() { return widgets.empty(); } void clear(); @@ -43,7 +41,7 @@ protected: }; Layout &layout; - Arrangement *parent; + Arrangement *parent = nullptr; Edge edges[4]; Arrangement(Layout &);