Simplify constructors with C++11

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

diff --git a/source/panel.h b/source/panel.h
index 8d67d14ffe46ff7b7ef5afaedfb83ce912da09b9..4b013a8b469eb363ac0a79a35c60b757aecee267 100644 (file)
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,8 +1,10 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
+#include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -12,7 +14,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>
@@ -21,6 +23,12 @@ public:
                typedef std::map<std::string, Widget *> WidgetMap;
 
        protected:
+               template<typename T>
+               struct AddChildType
+               {
+                       void operator()(const std::string &, Loader &) const;
+               };
+
                WidgetMap &wdg_map;
                Widget *last_widget;
 
@@ -28,8 +36,6 @@ public:
                Loader(Panel &, WidgetMap &);
 
        private:
-               template<typename T>
-               void add_child_type(const std::string &);
                Layout &get_layout();
                Widget &get_last_widget();
                template<typename T>
@@ -44,6 +50,8 @@ public:
                void layout();
                template<typename T>
                void unnamed_child();
+
+               friend class Panel;
        };
 
 private:
@@ -58,7 +66,11 @@ private:
        };
 
 protected:
-       Layout *layout;
+       std::vector<Widget *> nav_order;
+       Layout *layout = 0;
+
+       static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
+       static bool widget_registry_init_done;
 
        Panel(const Panel &);
        Panel &operator=(const Panel &);
@@ -66,6 +78,9 @@ public:
        Panel();
        virtual ~Panel();
 
+       template<typename T>
+       static void register_child_type(const std::string &);
+
        virtual const char *get_class() const { return "panel"; }
 
        void set_layout(Layout *);
@@ -81,11 +96,43 @@ protected:
        Widget *find_next_child(int, int, int, int, int) const;
        static int compute_delta(int, int, int, int, int);
 
-       virtual void on_geometry_change();
+       virtual void on_size_change();
        virtual void on_child_added(Widget &);
        virtual void on_child_removed(Widget &);
 };
 
+
+template<typename T>
+void Panel::register_child_type(const std::string &name)
+{
+       widget_registry.register_type<T>(name);
+}
+
+
+template<typename T>
+void Panel::Loader::child(const std::string &n)
+{
+       unnamed_child<T>();
+       wdg_map[n] = last_widget;
+}
+
+template<typename T>
+void Panel::Loader::unnamed_child()
+{
+       RefPtr<T> chl = new T();
+       load_sub(*chl);
+       obj.add(*chl.get());
+       last_widget = chl.release();
+}
+
+
+template<typename T>
+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>);
+}
+
 } // namespace GLtk
 } // namespace Msp