Rearrange members

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

diff --git a/source/label.cpp b/source/label.cpp
index 60c3f431f9e35ca05016fc25366574d93a48474b..6db6aa37820b593fa693cce70de22b65da469b2f 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -14,26 +14,20 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Label::Label(const Resources &r, const string &t):
-       Widget(r),
-       text()
+Label::Label(const string &t)
 {
        focusable = false;
-       update_style();
        set_text(t);
 }
 
 void Label::autosize()
 {
-       const list<Part> &parts = style->get_parts();
-       const Part *text_part = 0;
-       for(list<Part>::const_iterator i=parts.begin(); (!text_part && i!=parts.end()); ++i)
-               if(i->get_name()=="text")
-                       text_part = &*i;
+       if(!style)
+               return;
 
        geom.h = text.get_height();
        geom.w = text.get_width();
-       if(text_part)
+       if(const Part *text_part = style->get_part("text"))
        {
                const Sides &margin = text_part->get_margin();
                geom.w += margin.left+margin.right;