X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=d1f21bc9408113c1d65fb78ca711d1f5d51f6adf;hb=d7ae291415a21cc886fe318070b41ac8d3e57a30;hp=7f153eb5540e4462bfa57645fab2b113cfb06a8b;hpb=131ac8ff2c06f94d40f4bf98d4a6ec0d113cdffc;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 7f153eb..d1f21bc 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -52,7 +52,13 @@ Widget::Widget(const Resources &r):
 
 void Widget::update_style()
 {
-	style=&res.get_style(get_class(), style_name);
+	string sname=get_class();
+	if(!style_name.empty())
+	{
+		sname+='-';
+		sname+=style_name;
+	}
+	style=&res.get<Style>(sname);
 }
 
 void Widget::render_part(const Part &part) const
@@ -79,7 +85,7 @@ void Widget::render_text(const Part &part, const string &text) const
 	part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font->get_ascent()*font_size));
 	GL::scale_uniform(font_size);
 
-	const Color &color=style->get_font_color();
+	const GL::Color &color=style->get_font_color();
 	glColor3f(color.r, color.g, color.b);
 	font->draw_string(text);
 	glColor3f(1, 1, 1);