Use DerivedObjectLoader for widget loaders

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

diff --git a/source/panel.cpp b/source/panel.cpp
index 389e3d9be729485fc4c16db0ee4dca3237a5f3ed..9bc752413c84b3952feb43f76dc13758d4dd1118 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -77,8 +77,7 @@ void Panel::on_child_removed(Widget &wdg)
 
 
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
-       Widget::Loader(p),
-       pnl(p),
+       DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
        wdg_map(m)
 {
        add("button",    &Loader::child<Button>);
@@ -98,7 +97,7 @@ void Panel::Loader::child(const string &n)
 {
        RefPtr<T> chl = new T();
        load_sub(*chl);
-       pnl.add(*chl.get());
+       obj.add(*chl.get());
        wdg_map[n] = chl.release();
 }
 
@@ -106,7 +105,7 @@ void Panel::Loader::panel(const string &n)
 {
        RefPtr<Panel> p = new Panel();
        load_sub(*p, wdg_map);
-       pnl.add(*p.get());
+       obj.add(*p.get());
        wdg_map[n] = p.release();
 }