X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=451926956d12520de95ff4ba6aff7e9049556249;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=789ae37ecfec59fdd5987b9739fa0818dc98f8d9;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 789ae37..4519269 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -70,10 +70,10 @@ void Toggle::set_value(bool v)
 		clear_state(ACTIVE);
 }
 
-void Toggle::rebuild_special(const Part &part, CachedPart &cache)
+void Toggle::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, cache);
+		text.build(part, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -103,27 +103,21 @@ void Toggle::on_style_change()
 
 
 Toggle::Loader::Loader(Toggle &t):
-	Widget::Loader(t)
+	DataFile::DerivedObjectLoader<Toggle, Widget::Loader>(t)
 {
 	add("exclusive", &Toggle::exclusive);
 	add("text",      &Loader::text);
 	add("value",     &Toggle::value);
 }
 
-Toggle &Toggle::Loader::get_object() const
-{
-	return static_cast<Toggle &>(obj);
-}
-
 void Toggle::Loader::finish()
 {
-	Toggle &tgl = get_object();
-	tgl.set_state(ACTIVE, (tgl.value ? ACTIVE : NORMAL));
+	obj.set_state(ACTIVE, (obj.value ? ACTIVE : NORMAL));
 }
 
 void Toggle::Loader::text(const string &t)
 {
-	get_object().text = t;
+	obj.text = t;
 }
 
 } // namespace GLtk