Rework how widget ownership works in Container

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

diff --git a/source/panel.h b/source/panel.h
index b5755d0cbb1d4f39d7c0975d45cb19656eac8cf0..3061032789574f168c2bb2933f787d4f439c1284 100644 (file)
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
+#include <memory>
 #include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
@@ -36,7 +37,6 @@ public:
                Loader(Panel &, WidgetMap &);
 
        private:
-               Layout &get_layout();
                Widget &get_last_widget();
                template<typename T>
                void arrangement();
@@ -46,7 +46,7 @@ public:
                void expand(bool, bool);
                void ghost(bool);
                void gravity(int, int);
-               void grid(unsigned);
+               void grid(std::size_t);
                void layout();
                template<typename T>
                void unnamed_child();
@@ -67,38 +67,34 @@ private:
 
 protected:
        std::vector<Widget *> nav_order;
-       Layout *layout = nullptr;
+       std::unique_ptr<Layout> layout;
 
        static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
        static bool widget_registry_init_done;
 
-       Panel(const Panel &);
-       Panel &operator=(const Panel &);
 public:
        Panel();
-       virtual ~Panel();
 
        template<typename T>
        static void register_child_type(const std::string &);
 
-       virtual const char *get_class() const { return "panel"; }
+       const char *get_class() const override { return "panel"; }
 
-       void set_layout(Layout *);
-       Layout *get_layout() { return layout; }
+       Layout &get_or_create_layout();
 
 protected:
-       virtual void autosize_special(const Part &, Geometry &) const;
-       virtual void render_special(const Part &, GL::Renderer &) const;
+       void autosize_special(const Part &, Geometry &) const override;
+       void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-       virtual bool navigate(Navigation);
+       bool navigate(Navigation) override;
 protected:
        Widget *find_next_child(int, int, int, int, int) const;
        static int compute_delta(int, int, int, int, int);
 
-       virtual void on_size_change();
-       virtual void on_child_added(Widget &);
-       virtual void on_child_removed(Widget &);
+       void on_size_change() override;
+       void on_child_added(Widget &) override;
+       void on_child_removed(Widget &) override;
 };
 
 
@@ -119,10 +115,11 @@ void Panel::Loader::child(const std::string &n)
 template<typename T>
 void Panel::Loader::unnamed_child()
 {
-       RefPtr<T> chl = new T();
+       std::unique_ptr<T> chl = std::make_unique<T>();
        load_sub(*chl);
-       obj.add(*chl.get());
-       last_widget = chl.release();
+       Widget *wdg = chl.get();
+       obj.add(move(chl));
+       last_widget = wdg;
 }