X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftoggle.cpp;h=550d97a27584fbcba9a1e6699d4e4a23d2fffb6f;hb=3f301f9b6f73e886bdbb61565edb2c02667039d0;hp=9fbd098ae0783aab8a4e724e1975b85864bc8b48;hpb=1a5f227ac945bc9e6449d1552e5d9eb4c1c196fb;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 9fbd098..550d97a 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -16,12 +16,13 @@ namespace GLtk {
 
 Toggle::Toggle(const Resources &r, const string &t):
 	Widget(r),
-	text(t),
+	text(style),
 	pressed(false),
 	value(false),
 	exclusive(false)
 {
 	update_style();
+	set_text(t);
 }
 
 void Toggle::set_text(const string &t)
@@ -72,7 +73,7 @@ void Toggle::button_release(int x, int y, unsigned btn)
 void Toggle::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
 }
 
 void Toggle::exclude_siblings()
@@ -89,7 +90,7 @@ Toggle::Loader::Loader(Toggle &t):
 	Widget::Loader(t)
 {
 	add("exclusive", &Toggle::exclusive);
-	add("text",      &Toggle::text);
+	add("text",      &Loader::text);
 	add("value",     &Toggle::value);
 }
 
@@ -107,5 +108,10 @@ void Toggle::Loader::finish()
 		tgl.state&=~ACTIVE;
 }
 
+void Toggle::Loader::text(const string &t)
+{
+	static_cast<Toggle &>(wdg).text=t;
+}
+
 } // namespace GLtk
 } // namespace Msp