X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbutton.cpp;h=c9bca9adcdeebb25f0478f1faee0804e8fa77d46;hb=1e06dc208a02e68cf1bb127927e3ad5af3657c58;hp=aecfd32fe0d004a56c8201d0da5f33f32599c636;hpb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index aecfd32..c9bca9a 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -14,11 +14,12 @@ namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
 	Widget(r),
+	text(style),
 	icon(0),
 	pressed(false)
 {
-	set_text(t);
 	update_style();
+	set_text(t);
 }
 
 void Button::set_text(const std::string &t)
@@ -66,7 +67,8 @@ void Button::pointer_motion(int x, int y)
 void Button::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		//render_text(part, text);
+		text.render(part, geom);
 	if(part.get_name()=="icon" && icon)
 	{
 		Geometry rgeom;
@@ -95,12 +97,12 @@ void Button::render_special(const Part &part) const
 Button::Loader::Loader(Button &btn):
 	Widget::Loader(btn)
 {
-	add("text", &Button::text);
+	add("text", &Loader::text);
 }
 
-Button &Button::Loader::get_object() const
+void Button::Loader::text(const std::string &t)
 {
-	return static_cast<Button &>(wdg);
+	static_cast<Button &>(wdg).text=t;
 }
 
 } // namespace GLtk