X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.h;h=a0cba3b776f8ffe3fce88443775bff461304d85b;hb=83f553a382ce554951594de85e4fd7b854305463;hp=61502e44177c2d963f617da91fc1e4e5d86a570d;hpb=9f38197854e699a6093a906ab43f4238f3cd2388;p=libs%2Fgltk.git diff --git a/source/container.h b/source/container.h index 61502e4..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 = 0; + Widget *widget = nullptr; Time::TimeDelta time_since_animate; Child(Container &, Widget *); @@ -39,13 +38,13 @@ protected: }; std::list children; - Widget *click_focus = 0; + Widget *click_focus = nullptr; unsigned click_button = 0; - Widget *pointer_focus = 0; + Widget *pointer_focus = nullptr; bool pointer_grabbed = false; - Widget *input_focus = 0; - Widget *saved_input_focus = 0; - Widget *touch_focus = 0; + Widget *input_focus = nullptr; + Widget *saved_input_focus = nullptr; + Widget *touch_focus = nullptr; bool children_rebuild_needed = false; Container() = default;