Use std::unique_ptr for managing memory

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

diff --git a/source/container.h b/source/container.h
index b2f69d3bb2eae41cf35183d04f8cc5f1b47531ef..6311a411a57fb1b16e03dcdd24564242a2ac5902 100644 (file)
--- a/source/container.h
+++ b/source/container.h
@@ -1,8 +1,9 @@
 #ifndef MSP_GLTK_CONTAINER_H_
 #define MSP_GLTK_CONTAINER_H_
 
-#include <list>
+#include <memory>
 #include <stdexcept>
+#include <vector>
 #include <sigc++/trackable.h>
 #include "mspgltk_api.h"
 #include "widget.h"
@@ -37,7 +38,7 @@ protected:
                void rebuild_needed();
        };
 
-       std::list<Child *> children;
+       std::vector<std::unique_ptr<Child>> children;
        Widget *click_focus = nullptr;
        unsigned click_button = 0;
        Widget *pointer_focus = nullptr;
@@ -54,12 +55,11 @@ public:
        void add(Widget &);
        void remove(Widget &);
 protected:
-       virtual Child *create_child(Widget *);
        Geometry determine_child_geometry(const Widget &, const Part &) const;
        void autosize_child(const Widget &, const Part &, Geometry &) const;
        void reposition_child(Widget &, const Part &) const;
 public:
-       std::list<Widget *> get_children() const;
+       std::vector<Widget *> get_children() const;
        Widget *find_child_at(int, int) const;
        Widget *find_descendant_at(int, int) const;
        void raise(Widget &);