Rework how widget ownership works in Container

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

diff --git a/source/panel.h b/source/panel.h
index 9d969ff4e5f6ddc7d4cd62ac01e9a67e5f17fb92..3061032789574f168c2bb2933f787d4f439c1284 100644 (file)
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,9 +1,11 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
-#include <msp/datafile/loadabletyperegistry.h>
+#include <memory>
+#include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -13,7 +15,7 @@ Panels are containers for other widgets.  Panel styles should have a special
 part "children" to render the child widgets.  All properties of this part are
 ignored.
 */
-class Panel: public Container
+class MSPGLTK_API Panel: public Container
 {
 public:
        class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
@@ -25,7 +27,7 @@ public:
                template<typename T>
                struct AddChildType
                {
-                       static void add(Loader &, const std::string &);
+                       void operator()(const std::string &, Loader &) const;
                };
 
                WidgetMap &wdg_map;
@@ -35,7 +37,6 @@ public:
                Loader(Panel &, WidgetMap &);
 
        private:
-               Layout &get_layout();
                Widget &get_last_widget();
                template<typename T>
                void arrangement();
@@ -45,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();
@@ -66,38 +67,34 @@ private:
 
 protected:
        std::vector<Widget *> nav_order;
-       Layout *layout;
+       std::unique_ptr<Layout> layout;
 
-       static DataFile::LoadableTypeRegistry<Loader, Loader::AddChildType> widget_registry;
+       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;
 };
 
 
@@ -118,15 +115,16 @@ 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;
 }
 
 
 template<typename T>
-void Panel::Loader::AddChildType<T>::add(Loader &ldr, const std::string &kwd)
+void Panel::Loader::AddChildType<T>::operator()(const std::string &kwd, Loader &ldr) const
 {
        ldr.add(kwd, &Loader::child<T>);
        ldr.add(kwd, &Loader::unnamed_child<T>);