X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fcontainer.h;h=a0cba3b776f8ffe3fce88443775bff461304d85b;hb=83f553a382ce554951594de85e4fd7b854305463;hp=4c38675ea85e4f1dbc2cab354feb183c2ef8b780;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git diff --git a/source/container.h b/source/container.h index 4c38675..a0cba3b 100644 --- a/source/container.h +++ b/source/container.h @@ -14,7 +14,6 @@ class MSPGLTK_API hierarchy_error: public std::logic_error { public: hierarchy_error(const std::string &); - virtual ~hierarchy_error() throw() { } }; @@ -24,7 +23,7 @@ protected: struct Child: public sigc::trackable { Container &container; - Widget *widget; + Widget *widget = nullptr; Time::TimeDelta time_since_animate; Child(Container &, Widget *); @@ -39,16 +38,16 @@ protected: }; std::list children; - Widget *click_focus; - unsigned click_button; - Widget *pointer_focus; - bool pointer_grabbed; - Widget *input_focus; - Widget *saved_input_focus; - Widget *touch_focus; - bool children_rebuild_needed; - - Container(); + Widget *click_focus = nullptr; + unsigned click_button = 0; + Widget *pointer_focus = nullptr; + bool pointer_grabbed = false; + Widget *input_focus = nullptr; + Widget *saved_input_focus = nullptr; + Widget *touch_focus = nullptr; + bool children_rebuild_needed = false; + + Container() = default; public: virtual ~Container();