Loader improvements

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 9cd9066bc82663150daa9ad8fddc65b629650c02..1442151262121406319c9bdf737f5f2f54a34d56 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -128,7 +128,8 @@ void Widget::render() const
 
        GL::push_matrix();
        GL::translate(geom.x, geom.y, 0);
-       for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
+       const Style::PartSeq &parts = style->get_parts();
+       for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
        {
                if(i->get_name().empty())
                {
@@ -163,7 +164,7 @@ void Widget::focus_out()
 
 
 Widget::Loader::Loader(Widget &w):
-       wdg(w)
+       DataFile::ObjectLoader<Widget>(w)
 {
        add("position", &Loader::position);
        add("size",     &Loader::size);
@@ -173,17 +174,17 @@ Widget::Loader::Loader(Widget &w):
 
 void Widget::Loader::position(int x, int y)
 {
-       wdg.set_position(x, y);
+       obj.set_position(x, y);
 }
 
 void Widget::Loader::size(unsigned w, unsigned h)
 {
-       wdg.set_size(w, h);
+       obj.set_size(w, h);
 }
 
 void Widget::Loader::style(const string &s)
 {
-       wdg.set_style(s);
+       obj.set_style(s);
 }
 
 } // namespace GLtk