Convert loops and iterators to use C++11 features

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

diff --git a/source/label.cpp b/source/label.cpp
index e6b7efb0192b460185df5ac4d11a870ceb20e339..033bfd9296b07051bdd04691d0ba6d2d65985fff 100644 (file)
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -9,7 +9,6 @@ namespace GLtk {
 
 Label::Label(const string &t)
 {
-       focusable = false;
        set_text(t);
 }
 
@@ -17,10 +16,10 @@ void Label::set_text(const string &t)
 {
        text = t;
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
-void Label::autosize_special(const Part &part, Geometry &ageom)
+void Label::autosize_special(const Part &part, Geometry &ageom) const
 {
        if(part.get_name()=="text")
                text.autosize(part, ageom);
@@ -29,7 +28,7 @@ void Label::autosize_special(const Part &part, Geometry &ageom)
 void Label::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, part_cache);
+               text.build(part, state, geom, part_cache);
 }
 
 void Label::on_style_change()