Use nullptr instead of 0 for pointers

[libs/gltk.git] / source / container.h

diff --git a/source/container.h b/source/container.h
index 3117236daa7463d80961604732de717c778e59f8..adaee6f4bb02c17b021e6386e6eb988809c15051 100644 (file)
--- a/source/container.h
+++ b/source/container.h
@@ -4,12 +4,13 @@
 #include <list>
 #include <stdexcept>
 #include <sigc++/trackable.h>
+#include "mspgltk_api.h"
 #include "widget.h"
 
 namespace Msp {
 namespace GLtk {
 
-class hierarchy_error: public std::logic_error
+class MSPGLTK_API hierarchy_error: public std::logic_error
 {
 public:
        hierarchy_error(const std::string &);
@@ -17,13 +18,13 @@ public:
 };
 
 
-class Container: virtual public Widget
+class MSPGLTK_API Container: virtual public Widget
 {
 protected:
        struct Child: public sigc::trackable
        {
                Container &container;
-               Widget *widget;
+               Widget *widget = nullptr;
                Time::TimeDelta time_since_animate;
 
                Child(Container &, Widget *);
@@ -34,17 +35,20 @@ protected:
                void grab_pointer();
                void ungrab_pointer();
                void request_animation(const Time::TimeDelta &);
+               void rebuild_needed();
        };
 
        std::list<Child *> children;
-       Widget *click_focus;
-       unsigned click_button;
-       Widget *pointer_focus;
-       bool pointer_grabbed;
-       Widget *input_focus;
-       Widget *touch_focus;
-
-       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();
 
@@ -62,7 +66,7 @@ public:
        void raise(Widget &);
 
 protected:
-       void set_pointer_focus(Widget *);
+       void set_pointer_focus(Widget *, bool = false);
        void set_input_focus(Widget *);
 public:
        Widget *get_input_focus() const { return input_focus; }
@@ -71,6 +75,9 @@ public:
 private:
        void check_animation_interval();
 
+protected:
+       virtual void rebuild_hierarchy();
+
 public:
        virtual void button_press(int, int, unsigned);
        virtual void button_release(int, int, unsigned);
@@ -85,6 +92,7 @@ public:
        virtual bool key_press(unsigned, unsigned);
        virtual bool key_release(unsigned, unsigned);
        virtual bool character(wchar_t);
+       virtual void focus_in();
        virtual void focus_out();
        virtual bool navigate(Navigation);
        virtual void animate(const Time::TimeDelta &);