Rearrange members

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

diff --git a/source/container.cpp b/source/container.cpp
index b2b8c56adaec281394847f0d954d9f516e5859a6..9ad66482a15a2ad2503d7f0efcb12a6fe14383c4 100644 (file)
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2009-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -25,7 +25,7 @@ Container::~Container()
 
 void Container::add(Widget &wdg)
 {
-       set_parent(wdg, this);
+       wdg.set_parent(this);
        children.push_back(create_child(&wdg));
 }
 
@@ -34,7 +34,7 @@ void Container::remove(Widget &wdg)
        for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
                if((*i)->widget==&wdg)
                {
-                       set_parent(wdg, 0);
+                       wdg.set_parent(0);
                        delete *i;
                        children.erase(i);
                        return;
@@ -43,6 +43,11 @@ void Container::remove(Widget &wdg)
        throw InvalidState("That Widget is not in this Container");
 }
 
+Container::Child *Container::create_child(Widget *wdg)
+{
+       return new Child(*this, wdg);
+}
+
 list<Widget *> Container::get_children() const
 {
        list<Widget *> result;
@@ -139,18 +144,13 @@ void Container::pointer_leave()
        click_focus = 0;
 }
 
-Container::Child *Container::create_child(Widget *wdg)
-{
-       return new Child(*this, wdg);
-}
-
 void Container::on_reparent()
 {
        for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
        {
                if(Container *c = dynamic_cast<Container *>((*i)->widget))
                        c->on_reparent();
-               update_style(*(*i)->widget);
+               (*i)->widget->update_style();
        }
 }