Refactor Panel to create Layout internally on request

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

diff --git a/source/part.cpp b/source/part.cpp
index 22aa378f3f41d52146c473243b821938031ffc0c..aacc52adc28048372c6353dfe8b9a78c2acb72d5 100644 (file)
--- a/source/part.cpp
+++ b/source/part.cpp
@@ -11,9 +11,7 @@ namespace GLtk {
 
 Part::Part(const string &n):
        name(n)
-{
-       fill(graphic, graphic+N_STATES_, static_cast<Graphic *>(0));
-}
+{ }
 
 const Graphic *Part::get_graphic(State state) const
 {
@@ -46,7 +44,7 @@ Part::Loader::Loader(Part &p, Resources &r):
        add("size",    &Loader::size);
 }
 
-Part::Loader::~Loader()
+void Part::Loader::finish()
 {
        for(unsigned i=0; i<N_STATES_; ++i)
                if(obj.graphic[i])
@@ -65,7 +63,7 @@ void Part::Loader::graphic_normal(const string &n)
 
 void Part::Loader::graphic(State s, const string &n)
 {
-       Graphic *grph = (n.empty() ? 0 : &get_collection().get<Graphic>(n));
+       Graphic *grph = (n.empty() ? nullptr : &get_collection().get<Graphic>(n));
        for(int i=0; i<N_STATES_; ++i)
                if((i&s)==s)
                        obj.graphic[i] = grph;