X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flabel.cpp;h=60c3f431f9e35ca05016fc25366574d93a48474b;hb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;hp=18bef1a066bb529274644a78cddfd92ec64a1c10;hpb=a87d05583cb7dffaf0e0f5eb9f9b2fc0bcf656e1;p=libs%2Fgltk.git

diff --git a/source/label.cpp b/source/label.cpp
index 18bef1a..60c3f43 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -16,34 +16,34 @@ namespace GLtk {
 
 Label::Label(const Resources &r, const string &t):
 	Widget(r),
-	text(style)
+	text()
 {
-	focusable=false;
+	focusable = false;
 	update_style();
 	set_text(t);
 }
 
 void Label::autosize()
 {
-	const list<Part> &parts=style->get_parts();
-	const Part *text_part=0;
+	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;
+			text_part = &*i;
 
-	geom.h=text.get_height();
-	geom.w=text.get_width();
+	geom.h = text.get_height();
+	geom.w = text.get_width();
 	if(text_part)
 	{
-		const Sides &margin=text_part->get_margin();
-		geom.w+=margin.left+margin.right;
-		geom.h+=margin.top+margin.bottom;
+		const Sides &margin = text_part->get_margin();
+		geom.w += margin.left+margin.right;
+		geom.h += margin.top+margin.bottom;
 	}
 }
 
 void Label::set_text(const string &t)
 {
-	text=t;
+	text = t;
 }
 
 void Label::render_special(const Part &part) const
@@ -54,7 +54,7 @@ void Label::render_special(const Part &part) const
 
 void Label::on_style_change()
 {
-	text.update_style();
+	text.set_style(style);
 }
 
 
@@ -66,7 +66,7 @@ Label::Loader::Loader(Label &l):
 
 void Label::Loader::text(const string &t)
 {
-	static_cast<Label &>(wdg).text=t;
+	static_cast<Label &>(wdg).text = t;
 }
 
 } // namespace GLtk