X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=b5755d0cbb1d4f39d7c0975d45cb19656eac8cf0;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=9d969ff4e5f6ddc7d4cd62ac01e9a67e5f17fb92;hpb=7286d604956ddffcbfa2df6567de866f3d5df3a2;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index 9d969ff..b5755d0 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,9 +1,10 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
-#include <msp/datafile/loadabletyperegistry.h>
+#include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -13,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>
@@ -25,7 +26,7 @@ public:
 		template<typename T>
 		struct AddChildType
 		{
-			static void add(Loader &, const std::string &);
+			void operator()(const std::string &, Loader &) const;
 		};
 
 		WidgetMap &wdg_map;
@@ -66,9 +67,9 @@ private:
 
 protected:
 	std::vector<Widget *> nav_order;
-	Layout *layout;
+	Layout *layout = nullptr;
 
-	static DataFile::LoadableTypeRegistry<Loader, Loader::AddChildType> widget_registry;
+	static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
 	static bool widget_registry_init_done;
 
 	Panel(const Panel &);
@@ -126,7 +127,7 @@ void Panel::Loader::unnamed_child()
 
 
 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>);